From 3c9c26e05adb3a024ff5417221f7f21221fec64e Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sun, 19 Aug 2012 17:56:38 -0700
Subject: [PATCH] Move Document to dom::base

---
 src/servo/content/content_task.rs  | 13 +------------
 src/servo/dom/base.rs              | 13 ++++++++++++-
 src/servo/dom/bindings/document.rs |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/servo/content/content_task.rs b/src/servo/content/content_task.rs
index 5947e429c71..e6cf462cb8f 100644
--- a/src/servo/content/content_task.rs
+++ b/src/servo/content/content_task.rs
@@ -6,7 +6,6 @@
 export ContentTask;
 export ControlMsg, ExecuteMsg, ParseMsg, ExitMsg;
 export PingMsg, PongMsg;
-export Document;
 
 import std::arc::{arc, clone};
 import comm::{Port, Chan, port, chan, listen, select2};
@@ -14,7 +13,7 @@ import task::{spawn, spawn_listener};
 import io::{read_whole_file, println};
 import result::{ok, err};
 
-import dom::base::{Node, NodeScope, define_bindings};
+import dom::base::{Document, Node, NodeScope, define_bindings};
 import dom::event::{Event, ResizeEvent};
 import dom::style;
 import dom::style::Stylesheet;
@@ -71,16 +70,6 @@ fn join_layout(scope: NodeScope, layout_task: LayoutTask) {
     }
 }
 
-struct Document {
-    let root: Node;
-    let css_rules: arc<Stylesheet>;
-
-    new(root: Node, -css_rules: Stylesheet) {
-        self.root = root;
-        self.css_rules = arc(css_rules);
-    }
-}
-
 struct Content<C:Compositor send copy> {
     let compositor: C;
     let layout_task: LayoutTask;
diff --git a/src/servo/dom/base.rs b/src/servo/dom/base.rs
index 95b0aa8bfc2..554a90f20b9 100644
--- a/src/servo/dom/base.rs
+++ b/src/servo/dom/base.rs
@@ -11,8 +11,19 @@ import js::crust::*;
 import js::glue::bindgen::RUST_OBJECT_TO_JSVAL;
 import dvec::{DVec, dvec};
 import ptr::null;
-import content::content_task::Document;
 import bindings;
+import std::arc::arc;
+import style::Stylesheet;
+
+struct Document {
+    let root: Node;
+    let css_rules: arc<Stylesheet>;
+
+    new(root: Node, -css_rules: Stylesheet) {
+        self.root = root;
+        self.css_rules = arc(css_rules);
+    }
+}
 
 enum NodeData = {
     tree: tree::Tree<Node>,
diff --git a/src/servo/dom/bindings/document.rs b/src/servo/dom/bindings/document.rs
index 6f506ed60e2..50edc1aeee5 100644
--- a/src/servo/dom/bindings/document.rs
+++ b/src/servo/dom/bindings/document.rs
@@ -12,7 +12,7 @@ import ptr::null;
 import libc::c_uint;
 import utils::{DOMString, domstring_to_jsval, rust_box, squirrel_away, str};
 import bindings::node::create;
-import content::content_task::Document;
+import base::Document;
 
 enum DOMException {
     INVALID_CHARACTER_ERR