Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Make the MatchingMode in MatchingContext private.

Browse source 
It used to be the case that MatchingContext was immutable and thus we didn't
care to have accessors.

This is no longer true, so let's make this code a bit nicer.
This commit is contained in:
Emilio Cobos Álvarez 2018-01-20 02:26:59 +01:00
parent bccb757bcd
commit c384c21cb6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/selectors/context.rs
View file

@ -100,7 +100,7 @@ where
Impl: SelectorImpl, Impl: SelectorImpl,
{ {
/// Input with the matching mode we should use when matching selectors. /// 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. /// Input with the bloom filter used to fast-reject selectors.
pub bloom_filter: Option<&'a BloomFilter>, pub bloom_filter: Option<&'a BloomFilter>,
/// An optional cache to speed up nth-index-like selectors. /// An optional cache to speed up nth-index-like selectors.
@ -194,6 +194,12 @@ where
self.quirks_mode 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 /// The case-sensitivity for class and ID selectors
#[inline] #[inline]
pub fn classes_and_ids_case_sensitivity(&self) -> CaseSensitivity { pub fn classes_and_ids_case_sensitivity(&self) -> CaseSensitivity {

4
components/selectors/matching.rs
View file

@ -285,7 +285,7 @@ where
{ {
// If this is the special pseudo-element mode, consume the ::pseudo-element // If this is the special pseudo-element mode, consume the ::pseudo-element
// before proceeding, since the caller has already handled that part. // 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() { !context.is_nested() {
// Consume the pseudo. // Consume the pseudo.
match *iter.next().unwrap() { 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 // This compound selector had a pseudo-element to the right that we
// intentionally skipped. // intentionally skipped.
if rightmost == Rightmost::Yes && if rightmost == Rightmost::Yes &&
context.matching_mode == MatchingMode::ForStatelessPseudoElement { context.matching_mode() == MatchingMode::ForStatelessPseudoElement {
return MatchesHoverAndActiveQuirk::No; return MatchesHoverAndActiveQuirk::No;
} }