diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2014-08-12 23:23:52 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2014-08-16 08:32:47 +0100 |
commit | 5f3dc55f72fc93790dca05fd5fb5d8402d908971 (patch) | |
tree | 78224df2398a1a0473270881c4e93c5d1f51f89c /src/components/script/dom/element.rs | |
parent | 7e78e54c3f4e3d5e89c35d2ee36f81aed2278566 (diff) | |
download | servo-5f3dc55f72fc93790dca05fd5fb5d8402d908971.tar.gz servo-5f3dc55f72fc93790dca05fd5fb5d8402d908971.zip |
Make more things private to the style crate.
Diffstat (limited to 'src/components/script/dom/element.rs')
-rw-r--r-- | src/components/script/dom/element.rs | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs index 6213e8c9a6a..cdb2f4f1f2b 100644 --- a/src/components/script/dom/element.rs +++ b/src/components/script/dom/element.rs @@ -4,7 +4,6 @@ //! Element nodes. -use cssparser::tokenize; use dom::attr::{Attr, ReplacedAttr, FirstSetAttr, AttrHelpersForLayout}; use dom::attr::{AttrValue, StringAttrValue, UIntAttrValue, AtomAttrValue}; use dom::attrlist::AttrList; @@ -31,7 +30,7 @@ use dom::nodelist::NodeList; use dom::virtualmethods::{VirtualMethods, vtable_for}; use layout_interface::ContentChangedDocumentDamage; use layout_interface::MatchSelectorsDocumentDamage; -use style::{matches_compound_selector, NamespaceMap, parse_selector_list}; +use style::{matches, parse_selector_list_from_str}; use style; use servo_util::atom::Atom; use servo_util::namespace; @@ -775,21 +774,13 @@ impl<'a> ElementMethods for JSRef<'a, Element> { // http://dom.spec.whatwg.org/#dom-element-matches fn Matches(&self, selectors: DOMString) -> Fallible<bool> { - let namespace = NamespaceMap::new(); - match parse_selector_list(tokenize(selectors.as_slice()).map(|(token, _)| token).collect(), - &namespace) { - Err(()) => return Err(Syntax), + match parse_selector_list_from_str(selectors.as_slice()) { + Err(()) => Err(Syntax), Ok(ref selectors) => { let root: &JSRef<Node> = NodeCast::from_ref(self); - for selector in selectors.iter() { - let mut shareable = false; - if matches_compound_selector(&*selector.compound_selectors, root, &mut shareable) { - return Ok(true); - } - } + Ok(matches(selectors, root)) } } - Ok(false) } } |