summaryrefslogtreecommitdiffstats
path: root/servo/components/style/invalidation
diff options
context:
space:
mode:
Diffstat (limited to 'servo/components/style/invalidation')
-rw-r--r--servo/components/style/invalidation/element/document_state.rs5
-rw-r--r--servo/components/style/invalidation/element/relative_selector.rs6
-rw-r--r--servo/components/style/invalidation/element/state_and_attributes.rs4
3 files changed, 10 insertions, 5 deletions
diff --git a/servo/components/style/invalidation/element/document_state.rs b/servo/components/style/invalidation/element/document_state.rs
index 0b846510d8..5437943066 100644
--- a/servo/components/style/invalidation/element/document_state.rs
+++ b/servo/components/style/invalidation/element/document_state.rs
@@ -14,8 +14,8 @@ use crate::invalidation::element::state_and_attributes;
use crate::stylist::CascadeData;
use dom::DocumentState;
use selectors::matching::{
- MatchingContext, MatchingForInvalidation, MatchingMode, NeedsSelectorFlags, QuirksMode,
- SelectorCaches, VisitedHandlingMode,
+ IncludeStartingStyle, MatchingContext, MatchingForInvalidation, MatchingMode,
+ NeedsSelectorFlags, QuirksMode, SelectorCaches, VisitedHandlingMode,
};
/// A struct holding the members necessary to invalidate document state
@@ -59,6 +59,7 @@ impl<'a, 'b, E: TElement, I> DocumentStateInvalidationProcessor<'a, 'b, E, I> {
None,
selector_caches,
VisitedHandlingMode::AllLinksVisitedAndUnvisited,
+ IncludeStartingStyle::No,
quirks_mode,
NeedsSelectorFlags::No,
MatchingForInvalidation::No,
diff --git a/servo/components/style/invalidation/element/relative_selector.rs b/servo/components/style/invalidation/element/relative_selector.rs
index 41222304be..d57676905b 100644
--- a/servo/components/style/invalidation/element/relative_selector.rs
+++ b/servo/components/style/invalidation/element/relative_selector.rs
@@ -26,8 +26,8 @@ use dom::ElementState;
use fxhash::FxHashMap;
use selectors::matching::{
matches_compound_selector_from, matches_selector, CompoundSelectorMatchingResult,
- ElementSelectorFlags, MatchingContext, MatchingForInvalidation, MatchingMode,
- NeedsSelectorFlags, QuirksMode, SelectorCaches, VisitedHandlingMode,
+ ElementSelectorFlags, IncludeStartingStyle, MatchingContext, MatchingForInvalidation,
+ MatchingMode, NeedsSelectorFlags, QuirksMode, SelectorCaches, VisitedHandlingMode,
};
use selectors::parser::{Combinator, SelectorKey};
use selectors::OpaqueElement;
@@ -822,6 +822,7 @@ where
None,
&mut selector_caches,
VisitedHandlingMode::AllLinksVisitedAndUnvisited,
+ IncludeStartingStyle::No,
self.quirks_mode,
NeedsSelectorFlags::No,
MatchingForInvalidation::Yes,
@@ -1032,6 +1033,7 @@ where
None,
selector_caches,
VisitedHandlingMode::AllLinksVisitedAndUnvisited,
+ IncludeStartingStyle::No,
quirks_mode,
NeedsSelectorFlags::No,
MatchingForInvalidation::Yes,
diff --git a/servo/components/style/invalidation/element/state_and_attributes.rs b/servo/components/style/invalidation/element/state_and_attributes.rs
index d5f0723d66..ffb2302b55 100644
--- a/servo/components/style/invalidation/element/state_and_attributes.rs
+++ b/servo/components/style/invalidation/element/state_and_attributes.rs
@@ -24,7 +24,8 @@ use dom::ElementState;
use selectors::attr::CaseSensitivity;
use selectors::kleene_value::KleeneValue;
use selectors::matching::{
- matches_selector_kleene, MatchingContext, MatchingForInvalidation, MatchingMode, NeedsSelectorFlags, SelectorCaches, VisitedHandlingMode
+ matches_selector_kleene, IncludeStartingStyle, MatchingContext, MatchingForInvalidation,
+ MatchingMode, NeedsSelectorFlags, SelectorCaches, VisitedHandlingMode
};
use smallvec::SmallVec;
@@ -73,6 +74,7 @@ impl<'a, 'b: 'a, E: TElement + 'b> StateAndAttrInvalidationProcessor<'a, 'b, E>
None,
selector_caches,
VisitedHandlingMode::AllLinksVisitedAndUnvisited,
+ IncludeStartingStyle::No,
shared_context.quirks_mode(),
NeedsSelectorFlags::No,
MatchingForInvalidation::Yes,