Move script::dom::namespace into util, in order to use it from style later.

13 files changed, 13 insertions, 14 deletions

diff --git a/src/components/main/layout/wrapper.rs b/src/components/main/layout/wrapper.rs
index ca425072669..c0c4c0bd754 100644
--- a/src/components/main/layout/wrapper.rs
+++ b/src/components/main/layout/wrapper.rs
@@ -20,11 +20,11 @@ use script::dom::element::{Element, HTMLAreaElementTypeId, HTMLAnchorElementType
 use script::dom::element::{HTMLLinkElementTypeId};
 use script::dom::htmliframeelement::HTMLIFrameElement;
 use script::dom::htmlimageelement::HTMLImageElement;
-use script::dom::namespace;
-use script::dom::namespace::Namespace;
 use script::dom::node::{AbstractNode, DocumentNodeTypeId, ElementNodeTypeId, Node, NodeTypeId};
 use script::dom::text::Text;
 use servo_msg::constellation_msg::{PipelineId, SubpageId};
+use servo_util::namespace;
+use servo_util::namespace::Namespace;
 use std::cast;
 use style::{PropertyDeclarationBlock, TElement, TNode, AttrSelector};
 
diff --git a/src/components/script/dom/attr.rs b/src/components/script/dom/attr.rs
index 3903e2d891d..e7e13853087 100644
--- a/src/components/script/dom/attr.rs
+++ b/src/components/script/dom/attr.rs
@@ -5,8 +5,8 @@
 use dom::bindings::codegen::AttrBinding;
 use dom::bindings::utils::{Reflectable, Reflector, DOMString};
 use dom::bindings::utils::reflect_dom_object;
-use dom::namespace::{Namespace, Null};
 use dom::window::Window;
+use servo_util::namespace::{Namespace, Null};
 
 use std::util;
 
diff --git a/src/components/script/dom/document.rs b/src/components/script/dom/document.rs
index 08979165375..092b3e63abe 100644
--- a/src/components/script/dom/document.rs
+++ b/src/components/script/dom/document.rs
@@ -16,7 +16,6 @@ use dom::event::{AbstractEvent, Event};
 use dom::htmlcollection::HTMLCollection;
 use dom::htmldocument::HTMLDocument;
 use dom::mouseevent::MouseEvent;
-use dom::namespace::Null;
 use dom::node::{AbstractNode, Node, ElementNodeTypeId, DocumentNodeTypeId};
 use dom::text::Text;
 use dom::uievent::UIEvent;
@@ -24,6 +23,7 @@ use dom::window::Window;
 use dom::htmltitleelement::HTMLTitleElement;
 use html::hubbub_html_parser::build_element_from_tag;
 use layout_interface::{DocumentDamageLevel, ContentChangedDocumentDamage};
+use servo_util::namespace::Null;
 
 use js::jsapi::{JSObject, JSContext, JSTracer};
 use std::ascii::StrAsciiExt;
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index c2e790fd53d..f3c75db7a82 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -15,13 +15,13 @@ use dom::clientrectlist::ClientRectList;
 use dom::document::AbstractDocument;
 use dom::node::{AbstractNode, ElementNodeTypeId, Node, NodeIterator};
 use dom::document;
-use dom::namespace;
-use dom::namespace::{Namespace, Null};
 use dom::htmlserializer::serialize;
 use layout_interface::{ContentBoxQuery, ContentBoxResponse, ContentBoxesQuery};
 use layout_interface::{ContentBoxesResponse, ContentChangedDocumentDamage};
 use layout_interface::{MatchSelectorsDocumentDamage};
 use style;
+use servo_util::namespace;
+use servo_util::namespace::{Namespace, Null};
 
 use std::ascii::StrAsciiExt;
 use std::cast;
diff --git a/src/components/script/dom/htmldocument.rs b/src/components/script/dom/htmldocument.rs
index 144869392fe..0dad2905d89 100644
--- a/src/components/script/dom/htmldocument.rs
+++ b/src/components/script/dom/htmldocument.rs
@@ -6,8 +6,8 @@ use dom::bindings::codegen::HTMLDocumentBinding;
 use dom::bindings::utils::{Reflectable, Reflector, Traceable};
 use dom::document::{AbstractDocument, Document, HTML};
 use dom::htmlcollection::HTMLCollection;
-use dom::namespace::Null;
 use dom::window::Window;
+use servo_util::namespace::Null;
 
 use js::jsapi::JSTracer;
 use std::str::eq_slice;
diff --git a/src/components/script/dom/htmlelement.rs b/src/components/script/dom/htmlelement.rs
index f8703298926..19aecc6d947 100644
--- a/src/components/script/dom/htmlelement.rs
+++ b/src/components/script/dom/htmlelement.rs
@@ -9,7 +9,7 @@ use dom::element::{Element, ElementTypeId, HTMLElementTypeId};
 use dom::node::{AbstractNode, Node};
 use js::jsapi::{JSContext, JSVal};
 use js::JSVAL_NULL;
-use dom::namespace;
+use servo_util::namespace;
 
 pub struct HTMLElement {
     element: Element
diff --git a/src/components/script/dom/htmlimageelement.rs b/src/components/script/dom/htmlimageelement.rs
index 2939de9e43a..dd0c5514472 100644
--- a/src/components/script/dom/htmlimageelement.rs
+++ b/src/components/script/dom/htmlimageelement.rs
@@ -7,7 +7,6 @@ use dom::bindings::utils::{DOMString, ErrorResult};
 use dom::document::AbstractDocument;
 use dom::element::HTMLImageElementTypeId;
 use dom::htmlelement::HTMLElement;
-use dom::namespace::Null;
 use dom::node::{AbstractNode, Node};
 use extra::url::Url;
 use servo_util::geometry::to_px;
@@ -15,6 +14,7 @@ use layout_interface::{ContentBoxQuery, ContentBoxResponse};
 use servo_net::image_cache_task;
 use servo_net::image_cache_task::ImageCacheTask;
 use servo_util::url::make_url;
+use servo_util::namespace::Null;
 
 pub struct HTMLImageElement {
     htmlelement: HTMLElement,
diff --git a/src/components/script/dom/htmlserializer.rs b/src/components/script/dom/htmlserializer.rs
index 3de36d831f2..8dbedcb2679 100644
--- a/src/components/script/dom/htmlserializer.rs
+++ b/src/components/script/dom/htmlserializer.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use dom::namespace;
+use servo_util::namespace;
 use dom::attr::Attr;
 use dom::node::NodeIterator;
 use dom::node::{DoctypeNodeTypeId, DocumentFragmentNodeTypeId, CommentNodeTypeId, DocumentNodeTypeId, ElementNodeTypeId, TextNodeTypeId, AbstractNode};
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 7724dc80e30..d7179221bb5 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -8,7 +8,6 @@ use dom::htmlelement::HTMLElement;
 use dom::htmlheadingelement::{Heading1, Heading2, Heading3, Heading4, Heading5, Heading6};
 use dom::htmliframeelement::IFrameSize;
 use dom::htmlformelement::HTMLFormElement;
-use dom::namespace::Null;
 use dom::node::{AbstractNode, ElementNodeTypeId};
 use dom::types::*;
 use html::cssparse::{InlineProvenance, StylesheetProvenance, UrlProvenance, spawn_css_parser};
@@ -22,6 +21,7 @@ use servo_net::image_cache_task::ImageCacheTask;
 use servo_net::resource_task::{Load, Payload, Done, ResourceTask, load_whole_resource};
 use servo_util::url::make_url;
 use servo_util::task::spawn_named;
+use servo_util::namespace::Null;
 use std::cast;
 use std::cell::RefCell;
 use std::comm::{Port, SharedChan};
diff --git a/src/components/script/script.rc b/src/components/script/script.rc
index b7a642f4295..dd2eff22e95 100644
--- a/src/components/script/script.rc
+++ b/src/components/script/script.rc
@@ -136,7 +136,6 @@ pub mod dom {
     pub mod htmlunknownelement;
     pub mod location;
     pub mod mouseevent;
-    pub mod namespace;
     pub mod navigator;
     pub mod node;
     pub mod nodelist;
diff --git a/src/components/script/script_task.rs b/src/components/script/script_task.rs
index 362bdc9fc87..b226f05916b 100644
--- a/src/components/script/script_task.rs
+++ b/src/components/script/script_task.rs
@@ -13,7 +13,6 @@ use dom::event::{Event_, ResizeEvent, ReflowEvent, ClickEvent, MouseDownEvent, M
 use dom::event::Event;
 use dom::eventtarget::AbstractEventTarget;
 use dom::htmldocument::HTMLDocument;
-use dom::namespace::Null;
 use dom::node::AbstractNode;
 use dom::window::{TimerData, TimerHandle, Window};
 use html::hubbub_html_parser::HtmlParserResult;
@@ -47,6 +46,7 @@ use servo_net::resource_task::ResourceTask;
 use servo_util::geometry::to_frac_px;
 use servo_util::url::make_url;
 use servo_util::task::spawn_named;
+use servo_util::namespace::Null;
 use std::comm::{Port, SharedChan};
 use std::ptr;
 use std::str::eq_slice;
diff --git a/src/components/script/dom/namespace.rs b/src/components/util/namespace.rs
index 354f95f69b2..354f95f69b2 100644
--- a/src/components/script/dom/namespace.rs
+++ b/src/components/util/namespace.rs
diff --git a/src/components/util/util.rc b/src/components/util/util.rc
index 1fb520c0c7b..8e7e8dfd2f2 100644
--- a/src/components/util/util.rc
+++ b/src/components/util/util.rc
@@ -21,4 +21,4 @@ pub mod debug;
 pub mod io;
 pub mod task;
 pub mod workqueue;
-
+pub mod namespace;