aboutsummaryrefslogtreecommitdiffstats
path: root/components/selectors
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-01-19 23:05:18 -0600
committerGitHub <noreply@github.com>2018-01-19 23:05:18 -0600
commit6fc71a7644bd7afcccf83f67cfdaf01897e1a3bc (patch)
tree340a0cfcbb9065a62c57490786e2754f50db6518 /components/selectors
parent3b07be555310a3a31445fae1150720cc3ff7d5d5 (diff)
parentbe4c0fecd8f997823850e3968a58e688bb8397bb (diff)
downloadservo-6fc71a7644bd7afcccf83f67cfdaf01897e1a3bc.tar.gz
servo-6fc71a7644bd7afcccf83f67cfdaf01897e1a3bc.zip
Auto merge of #19822 - emilio:less-match-public, r=KiChjang
style: More tiny selector-matching cleanup See each commit individually. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19822) <!-- Reviewable:end -->
Diffstat (limited to 'components/selectors')
-rw-r--r--components/selectors/context.rs8
-rw-r--r--components/selectors/matching.rs4
2 files changed, 9 insertions, 3 deletions
diff --git a/components/selectors/context.rs b/components/selectors/context.rs
index f61823a626d..257a29afc44 100644
--- a/components/selectors/context.rs
+++ b/components/selectors/context.rs
@@ -100,7 +100,7 @@ where
Impl: SelectorImpl,
{
/// Input with the matching mode we should use when matching selectors.
- pub matching_mode: MatchingMode,
+ matching_mode: MatchingMode,
/// Input with the bloom filter used to fast-reject selectors.
pub bloom_filter: Option<&'a BloomFilter>,
/// An optional cache to speed up nth-index-like selectors.
@@ -204,6 +204,12 @@ where
self.quirks_mode
}
+ /// The matching-mode for this selector-matching operation.
+ #[inline]
+ pub fn matching_mode(&self) -> MatchingMode {
+ self.matching_mode
+ }
+
/// The case-sensitivity for class and ID selectors
#[inline]
pub fn classes_and_ids_case_sensitivity(&self) -> CaseSensitivity {
diff --git a/components/selectors/matching.rs b/components/selectors/matching.rs
index d52b51d7270..eda52011ac7 100644
--- a/components/selectors/matching.rs
+++ b/components/selectors/matching.rs
@@ -285,7 +285,7 @@ where
{
// If this is the special pseudo-element mode, consume the ::pseudo-element
// before proceeding, since the caller has already handled that part.
- if context.matching_mode == MatchingMode::ForStatelessPseudoElement &&
+ if context.matching_mode() == MatchingMode::ForStatelessPseudoElement &&
!context.is_nested() {
// Consume the pseudo.
match *iter.next().unwrap() {
@@ -349,7 +349,7 @@ fn matches_hover_and_active_quirk<Impl: SelectorImpl>(
// This compound selector had a pseudo-element to the right that we
// intentionally skipped.
if rightmost == Rightmost::Yes &&
- context.matching_mode == MatchingMode::ForStatelessPseudoElement {
+ context.matching_mode() == MatchingMode::ForStatelessPseudoElement {
return MatchesHoverAndActiveQuirk::No;
}