aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2017-05-15 23:52:09 +0200
committerEmilio Cobos Álvarez <emilio@crisal.io>2017-05-17 10:58:24 +0200
commit522f8489d6fca474e6aad1d341ee84a99c130738 (patch)
treedeac46958e2f132881752f42a958b15f679a84d1 /components/script
parent837531992864f920342020462830b933d5ed0280 (diff)
downloadservo-522f8489d6fca474e6aad1d341ee84a99c130738.tar.gz
servo-522f8489d6fca474e6aad1d341ee84a99c130738.zip
Bug 1364850: Move PseudoElement to be just another combinator in selectors. r=bholley
MozReview-Commit-ID: 8OoOIodkKJ5 Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/element.rs20
-rw-r--r--components/script/dom/node.rs10
-rw-r--r--components/script/layout_wrapper.rs16
3 files changed, 38 insertions, 8 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 91ea1435302..09af8e042ae 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -85,7 +85,7 @@ use net_traits::request::CorsSettings;
use ref_filter_map::ref_filter_map;
use script_layout_interface::message::ReflowQueryType;
use script_thread::Runnable;
-use selectors::matching::{ElementSelectorFlags, MatchingContext, matches_selector_list};
+use selectors::matching::{ElementSelectorFlags, MatchingContext, MatchingMode, matches_selector_list};
use selectors::matching::{HAS_EDGE_CHILD_SELECTOR, HAS_SLOW_SELECTOR, HAS_SLOW_SELECTOR_LATER_SIBLINGS};
use selectors::parser::{AttrSelector, NamespaceConstraint};
use servo_atoms::Atom;
@@ -103,7 +103,7 @@ use style::properties::{Importance, PropertyDeclaration, PropertyDeclarationBloc
use style::properties::longhands::{self, background_image, border_spacing, font_family, font_size, overflow_x};
use style::restyle_hints::RESTYLE_SELF;
use style::rule_tree::CascadeLevel;
-use style::selector_parser::{NonTSPseudoClass, RestyleDamage, SelectorImpl, SelectorParser};
+use style::selector_parser::{NonTSPseudoClass, PseudoElement, RestyleDamage, SelectorImpl, SelectorParser};
use style::shared_lock::{SharedRwLock, Locked};
use style::sink::Push;
use style::stylearc::Arc;
@@ -2046,7 +2046,8 @@ impl ElementMethods for Element {
match SelectorParser::parse_author_origin_no_namespace(&selectors) {
Err(()) => Err(Error::Syntax),
Ok(selectors) => {
- Ok(matches_selector_list(&selectors.0, &Root::from_ref(self), None))
+ let mut ctx = MatchingContext::new(MatchingMode::Normal, None);
+ Ok(matches_selector_list(&selectors.0, &Root::from_ref(self), &mut ctx))
}
}
}
@@ -2064,8 +2065,8 @@ impl ElementMethods for Element {
let root = self.upcast::<Node>();
for element in root.inclusive_ancestors() {
if let Some(element) = Root::downcast::<Element>(element) {
- if matches_selector_list(&selectors.0, &element, None)
- {
+ let mut ctx = MatchingContext::new(MatchingMode::Normal, None);
+ if matches_selector_list(&selectors.0, &element, &mut ctx) {
return Ok(Some(element));
}
}
@@ -2374,6 +2375,15 @@ impl<'a> ::selectors::Element for Root<Element> {
self.upcast::<Node>().GetParentElement()
}
+ fn match_pseudo_element(&self,
+ _pseudo: &PseudoElement,
+ _context: &mut MatchingContext)
+ -> bool
+ {
+ false
+ }
+
+
fn first_child_element(&self) -> Option<Root<Element>> {
self.node.child_elements().next()
}
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index bec7a34d63f..5ebedf30bcd 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -68,7 +68,7 @@ use script_layout_interface::{LayoutElementType, LayoutNodeType, TrustedNodeAddr
use script_layout_interface::message::Msg;
use script_traits::DocumentActivity;
use script_traits::UntrustedNodeAddress;
-use selectors::matching::matches_selector_list;
+use selectors::matching::{matches_selector_list, MatchingContext, MatchingMode};
use selectors::parser::SelectorList;
use servo_url::ServoUrl;
use std::borrow::ToOwned;
@@ -341,11 +341,14 @@ impl<'a> Iterator for QuerySelectorIterator {
fn next(&mut self) -> Option<Root<Node>> {
let selectors = &self.selectors.0;
+
// TODO(cgaebel): Is it worth it to build a bloom filter here
// (instead of passing `None`)? Probably.
+ let mut ctx = MatchingContext::new(MatchingMode::Normal, None);
+
self.iterator.by_ref().filter_map(|node| {
if let Some(element) = Root::downcast(node) {
- if matches_selector_list(selectors, &element, None) {
+ if matches_selector_list(selectors, &element, &mut ctx) {
return Some(Root::upcast(element));
}
}
@@ -707,8 +710,9 @@ impl Node {
Err(()) => Err(Error::Syntax),
// Step 3.
Ok(selectors) => {
+ let mut ctx = MatchingContext::new(MatchingMode::Normal, None);
Ok(self.traverse_preorder().filter_map(Root::downcast).find(|element| {
- matches_selector_list(&selectors.0, element, None)
+ matches_selector_list(&selectors.0, element, &mut ctx)
}))
}
}
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs
index 7802d446114..4cf1789beef 100644
--- a/components/script/layout_wrapper.rs
+++ b/components/script/layout_wrapper.rs
@@ -652,6 +652,14 @@ impl<'le> ::selectors::Element for ServoLayoutElement<'le> {
self.element.namespace()
}
+ fn match_pseudo_element(&self,
+ _pseudo: &PseudoElement,
+ _context: &mut MatchingContext)
+ -> bool
+ {
+ false
+ }
+
fn match_non_ts_pseudo_class<F>(&self,
pseudo_class: &NonTSPseudoClass,
_: &mut MatchingContext,
@@ -1150,6 +1158,14 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> {
self.element.get_namespace()
}
+ fn match_pseudo_element(&self,
+ _pseudo: &PseudoElement,
+ _context: &mut MatchingContext)
+ -> bool
+ {
+ false
+ }
+
fn match_non_ts_pseudo_class<F>(&self,
_: &NonTSPseudoClass,
_: &mut MatchingContext,