style: Split collected @font-face / @counter-style rules per origin. #18037
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:
|
|
|
highfive
added
the
S-awaiting-review
|
r? @emilio |
heycam
force-pushed
the
split-cascade-font-counter
branch
from
0b466db
to
3dabe90
Compare
|
Untested, but doing a try run now: https://treeherder.mozilla.org/#/jobs?repo=try&revision=9909fc82c51ab3f4b3173fe0bc9b570fd3ca1f5b |
|
@bors-servo try |
bors-servo
pushed a commit
that referenced
this pull request
Aug 10, 2017
style: Split collected @font-face / @counter-style rules per origin. <!-- Please describe your changes on the following line: --> More refactoring in preparation for rebuilding sheets only from the origin that changed. --- <!-- 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/18037) <!-- Reviewable:end -->
|
💔 Test failed - linux-dev |
emilio
approved these changes
Aug 10, 2017
components/style/stylist.rs
Outdated
| user: PerOriginExtraStyleData, | ||
| } | ||
|
|
||
| /// ... |
| @@ -506,11 +545,15 @@ impl Stylist { | |||
| } | |||
| #[cfg(feature = "gecko")] | |||
| CssRule::FontFace(ref rule) => { | |||
| _extra_data.add_font_face(&rule, origin); | |||
| _extra_data | |||
| .borrow_mut_for_origin(&origin) | |||
There was a problem hiding this comment.
This can move to the outer loop I guess, not sure if worth, given you'd need to cfg it somehow.
| } | ||
|
|
||
| #[cfg(feature = "gecko")] | ||
| impl<'a> Iterator for ExtraStyleDataIter<'a> { |
There was a problem hiding this comment.
I suspect it's going to be nicer to have a PerOrigin<T> that abstracts all this stuff.
There was a problem hiding this comment.
In the interests of time I'll leave this for later.
heycam
force-pushed
the
split-cascade-font-counter
branch
from
3dabe90
to
5762200
Compare
|
@bors-servo r=emilio |
|
📌 Commit 5762200 has been approved by |
highfive
added
S-awaiting-merge
bors-servo
pushed a commit
that referenced
this pull request
Aug 11, 2017
style: Split collected @font-face / @counter-style rules per origin. <!-- Please describe your changes on the following line: --> More refactoring in preparation for rebuilding sheets only from the origin that changed. --- <!-- 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/18037) <!-- 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
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.
More refactoring in preparation for rebuilding sheets only from the origin that changed.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is