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

Auto merge of #19822 - emilio:less-match-public, r=KiChjang

Browse source 
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 -->
This commit is contained in:
bors-servo 2018-01-19 23:05:18 -06:00 • committed by GitHub
commit 6fc71a7644
4 changed files with 47 additions and 36 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,
{
/// 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 {

4
components/selectors/matching.rs
View file

@ -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;
}