diff options
Diffstat (limited to 'components/script/dom')
22 files changed, 22 insertions, 22 deletions
diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index cc5ebbe96a5..bd2d90e2ec6 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -15,13 +15,13 @@ use dom::window::Window; use dom::virtualmethods::vtable_for; use devtools_traits::AttrInfo; -use servo_util::atom::Atom; use servo_util::namespace; use servo_util::namespace::Namespace; use servo_util::str::{DOMString, split_html_space_chars}; use std::cell::{Ref, RefCell}; use std::mem; use std::slice::Items; +use string_cache::Atom; pub enum AttrSettingType { FirstSetAttr, diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index 0d87892aecf..af3083d456d 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -35,7 +35,6 @@ use std::rc::Rc; use std::cell::{Cell, RefCell}; use url::Url; -use servo_util::atom::Atom; use servo_util::namespace::Namespace; use msg::constellation_msg::{PipelineId, SubpageId, WindowSizeData}; use net::image_cache_task::ImageCacheTask; @@ -43,6 +42,7 @@ use script_traits::ScriptControlChan; use std::collections::hashmap::HashMap; use collections::hash::Hash; use style::PropertyDeclarationBlock; +use string_cache::Atom; impl<T: Reflectable> JSTraceable for JS<T> { fn trace(&self, trc: *mut JSTracer) { diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 63f205206fa..a66ec400e34 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -55,10 +55,10 @@ use dom::window::{Window, WindowHelpers}; use html::hubbub_html_parser::build_element_from_tag; use hubbub::hubbub::{QuirksMode, NoQuirks, LimitedQuirks, FullQuirks}; use layout_interface::{DocumentDamageLevel, ContentChangedDocumentDamage}; -use servo_util::atom::Atom; use servo_util::namespace; use servo_util::namespace::{Namespace, Null}; use servo_util::str::{DOMString, split_html_space_chars}; +use string_cache::Atom; use std::collections::hashmap::HashMap; use std::ascii::StrAsciiExt; diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 3d99d9df7eb..d66fc059582 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -12,9 +12,9 @@ use dom::bindings::utils::{Reflector, Reflectable, reflect_dom_object}; use dom::element::{Element, AttributeHandlers}; use dom::node::window_from_node; -use servo_util::atom::Atom; use servo_util::namespace::Null; use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS}; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index a4ae4734ffc..a789ecb41a7 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -34,7 +34,6 @@ use layout_interface::MatchSelectorsDocumentDamage; use devtools_traits::AttrInfo; use style::{matches, parse_selector_list_from_str}; use style; -use servo_util::atom::Atom; use servo_util::namespace; use servo_util::namespace::{Namespace, Null}; use servo_util::str::DOMString; @@ -42,6 +41,7 @@ use servo_util::str::DOMString; use std::ascii::StrAsciiExt; use std::cell::{Cell, RefCell}; use std::mem; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index 4835bb64371..764be50c83f 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -17,8 +17,8 @@ use dom::htmlelement::HTMLElement; use dom::node::{Node, ElementNodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 0a61eaab5f9..01a1e513748 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -16,8 +16,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index f50794d91a8..d0f0e37ff55 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -18,8 +18,8 @@ use dom::htmlelement::HTMLElement; use dom::node::{Node, ElementNodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::{DOMString, parse_unsigned_integer}; +use string_cache::Atom; use geom::size::Size2D; diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 1d9613c6259..049cb5de60e 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -12,11 +12,11 @@ use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::element::{Element, AttributeHandlers, ElementHelpers}; use dom::node::{Node, NodeHelpers}; use dom::window::Window; -use servo_util::atom::Atom; use servo_util::namespace::Namespace; use servo_util::str::{DOMString, split_html_space_chars}; use std::ascii::StrAsciiExt; +use string_cache::Atom; pub trait CollectionFilter : JSTraceable { fn filter(&self, elem: JSRef<Element>, root: JSRef<Node>) -> bool; diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index e0d0d213d83..44ed7910320 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -17,9 +17,9 @@ use dom::eventtarget::{EventTarget, EventTargetHelpers, NodeTargetTypeId}; use dom::node::{Node, ElementNodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::namespace; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index 167fbbe084e..2d5188b644e 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -18,8 +18,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::{DOMString, StaticStringVec}; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index 828ba978427..49323fea7a9 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -23,9 +23,9 @@ use page::IterablePage; use servo_msg::constellation_msg::{PipelineId, SubpageId}; use servo_msg::constellation_msg::{IFrameSandboxed, IFrameUnsandboxed}; use servo_msg::constellation_msg::{ConstellationChan, LoadIframeUrlMsg}; -use servo_util::atom::Atom; use servo_util::namespace::Null; use servo_util::str::DOMString; +use string_cache::Atom; use std::ascii::StrAsciiExt; use std::cell::Cell; diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 7ffe03eff81..544959bf397 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -17,9 +17,9 @@ use dom::htmlelement::HTMLElement; use dom::node::{Node, ElementNodeTypeId, NodeHelpers, window_from_node}; use dom::virtualmethods::VirtualMethods; use servo_net::image_cache_task; -use servo_util::atom::Atom; use servo_util::geometry::to_px; use servo_util::str::DOMString; +use string_cache::Atom; use url::{Url, UrlParser}; diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 9fafe3c2f63..cc4c85a0791 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index e59c337dcf8..fe78cfe47c4 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -15,12 +15,12 @@ use dom::htmlelement::HTMLElement; use dom::node::{Node, NodeHelpers, ElementNodeTypeId, window_from_node}; use dom::virtualmethods::VirtualMethods; use layout_interface::{LayoutChan, LoadStylesheetMsg}; -use servo_util::atom::Atom; use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS}; use servo_util::namespace::Null; use std::ascii::StrAsciiExt; use url::UrlParser; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index 49ea7d1a716..759f3c37c59 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -20,9 +20,9 @@ use dom::virtualmethods::VirtualMethods; use servo_net::image_cache_task; use servo_net::image_cache_task::ImageCacheTask; -use servo_util::atom::Atom; use servo_util::namespace::Null; use servo_util::str::DOMString; +use string_cache::Atom; use url::Url; diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index 974dd047bf4..bf5782fb4e3 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index fc889bc855c..b87621f8e3b 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -19,9 +19,9 @@ use dom::htmlelement::HTMLElement; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::namespace; use servo_util::str::{DOMString, split_html_space_chars}; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index 891a9787624..787a7e32b09 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -18,8 +18,8 @@ use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId, wind use dom::validitystate::ValidityState; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/htmlserializer.rs b/components/script/dom/htmlserializer.rs index 19aa7e2f0dd..32606f94896 100644 --- a/components/script/dom/htmlserializer.rs +++ b/components/script/dom/htmlserializer.rs @@ -18,8 +18,8 @@ use dom::node::{TextNodeTypeId, NodeHelpers}; use dom::processinginstruction::ProcessingInstruction; use dom::text::Text; -use servo_util::atom::Atom; use servo_util::namespace; +use string_cache::Atom; #[allow(unrooted_must_root)] pub fn serialize(iterator: &mut NodeIterator) -> String { diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 60a84a4d93f..763c636d5b6 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -15,8 +15,8 @@ use dom::htmlelement::HTMLElement; use dom::node::{DisabledStateHelpers, Node, NodeHelpers, ElementNodeTypeId}; use dom::virtualmethods::VirtualMethods; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; #[jstraceable] #[must_root] diff --git a/components/script/dom/virtualmethods.rs b/components/script/dom/virtualmethods.rs index 8c37b788a26..faa3c91aaf2 100644 --- a/components/script/dom/virtualmethods.rs +++ b/components/script/dom/virtualmethods.rs @@ -57,8 +57,8 @@ use dom::htmlstyleelement::HTMLStyleElement; use dom::htmltextareaelement::HTMLTextAreaElement; use dom::node::{Node, NodeHelpers, ElementNodeTypeId}; -use servo_util::atom::Atom; use servo_util::str::DOMString; +use string_cache::Atom; /// Trait to allow DOM nodes to opt-in to overriding (or adding to) common /// behaviours. Replicates the effect of C++ virtual methods. |