From 4bb240ac79c55f4a88d8cf0d6f4021472bc7ca92 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Sep 2012 18:17:30 -0700
Subject: [PATCH] Move display_list from layout to gfx

---
 src/servo/{layout => gfx}/display_list.rs | 0
 src/servo/gfx/png_compositor.rs           | 2 +-
 src/servo/gfx/render_task.rs              | 2 +-
 src/servo/layout/display_list_builder.rs  | 2 +-
 src/servo/servo.rc                        | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/servo/{layout => gfx}/display_list.rs (100%)

diff --git a/src/servo/layout/display_list.rs b/src/servo/gfx/display_list.rs
similarity index 100%
rename from src/servo/layout/display_list.rs
rename to src/servo/gfx/display_list.rs
diff --git a/src/servo/gfx/png_compositor.rs b/src/servo/gfx/png_compositor.rs
index 76f9ec1b9db..2e80cac7a9c 100644
--- a/src/servo/gfx/png_compositor.rs
+++ b/src/servo/gfx/png_compositor.rs
@@ -24,7 +24,7 @@ use vec_from_buf = vec::raw::from_buf;
 use ptr::addr_of;
 use dom::event::Event;
 use dvec::DVec;
-use layout::display_list::DisplayList;
+use display_list::DisplayList;
 use std::cell::Cell;
 
 pub type PngCompositor = Chan<Msg>;
diff --git a/src/servo/gfx/render_task.rs b/src/servo/gfx/render_task.rs
index d165a628764..c0415015507 100644
--- a/src/servo/gfx/render_task.rs
+++ b/src/servo/gfx/render_task.rs
@@ -2,7 +2,7 @@ use platform::osmain;
 use geometry::*;
 use comm::*;
 use image::base::Image;
-use dl = layout::display_list;
+use dl = display_list;
 use azure::*;
 use azure::bindgen::*;
 use libc::size_t;
diff --git a/src/servo/layout/display_list_builder.rs b/src/servo/layout/display_list_builder.rs
index 0081ac9d8cb..354070667a4 100644
--- a/src/servo/layout/display_list_builder.rs
+++ b/src/servo/layout/display_list_builder.rs
@@ -2,7 +2,7 @@ export build_display_list;
 
 use css::values::{BgColor, BgTransparent, Specified};
 use base::{Box, BTree, ImageHolder, TextBoxKind};
-use dl = layout::display_list;
+use dl = gfx::display_list;
 use dom::base::{Text, NodeScope};
 use dom::rcu::Scope;
 use either::{Left, Right};
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index ed7a9fbbb9b..bd5de682d35 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -55,7 +55,6 @@ mod layout {
     mod base;
     mod block;
     mod box_builder;
-    mod display_list;
     mod display_list_builder;
     mod inline;
     mod layout_task;
@@ -69,6 +68,7 @@ mod gfx {
     mod render_task;
     mod compositor;
     mod png_compositor;
+    mod display_list;
 }
 
 mod image {