style: Invert storage of selector maps to key off origin first. #17990
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Heads up! This PR modifies the following files:
|
|
|
|
r? @emilio |
|
(This is the first patch from https://bugzilla.mozilla.org/show_bug.cgi?id=1382925.) |
emilio
approved these changes
Aug 7, 2017
components/style/stylist.rs
Outdated
| /// rules against the current device. | ||
| element_map: PerPseudoElementSelectorMap, | ||
| /// Selector maps for all of the style sheets in the stylist, after | ||
| /// evalutaing media rules agains the current device, split out per |
| } | ||
|
|
||
| #[inline] | ||
| fn borrow_mut_for_pseudo_or_insert(&mut self, pseudo: Option<&PseudoElement>) -> &mut SelectorMap<Rule> { |
There was a problem hiding this comment.
I don't particularly love this name, but... I guess :-)
components/style/stylist.rs
Outdated
| } | ||
|
|
||
| fn has_rules_for_pseudo(&self, pseudo: &PseudoElement) -> bool { | ||
| self.pseudos_map.contains_key(pseudo) |
There was a problem hiding this comment.
On another note, we should probably make the pseudos map be an enumerated array, but that's probably ok for now.
heycam
force-pushed
the
invert-selector-maps
branch
from
804b634
to
39f2034
Compare
|
@bors-servo r=emilio |
|
📌 Commit 39f2034 has been approved by |
highfive
added
S-awaiting-merge
|
@bors-servo p=10 |
emilio
added a commit
to emilio/servo
that referenced
this pull request
Aug 7, 2017
This is on top of servo#17990, and it's intended to help with bug 1386045.
emilio
added a commit
to emilio/servo
that referenced
this pull request
Aug 7, 2017
… in the cascade data. This is on top of servo#17990, and it's intended to help with bug 1386045.
bors-servo
pushed a commit
that referenced
this pull request
Aug 7, 2017
style: Invert storage of selector maps to key off origin first. <!-- Please describe your changes on the following line: --> This will make it easier to avoid rebuilding all cascade levels when only a style sheet at a particular level changes. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [ ] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/17990) <!-- Reviewable:end -->
|
☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev |
highfive
removed
the
S-awaiting-merge
emilio
added a commit
to emilio/servo
that referenced
this pull request
Aug 7, 2017
… in the cascade data. This is on top of servo#17990, and it's intended to help with bug 1386045.
bors-servo
pushed a commit
that referenced
this pull request
Aug 7, 2017
style: Avoid branching on the origin for each selector when inserting in the cascade data. This is on top of #17990, and it's intended to help with bug 1386045. <!-- 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/17991) <!-- Reviewable:end -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will make it easier to avoid rebuilding all cascade levels when only a style sheet at a particular level changes.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is