Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: Fix various issues with XBL rule matching #18652

Merged
merged 2 commits into from Sep 27, 2017
Merged

style: Fix various issues with XBL rule matching #18652

merged 2 commits into from Sep 27, 2017

Conversation

emilio
Copy link
Member

@emilio emilio commented Sep 27, 2017 •
edited by SimonSapin

See the commit details.

This change is Reviewable

@emilio
style: Do not optimize out lazy pseudo rules if the main stylist does…
d82e692 
…n't have rules for it.

This could prevent an XBL binding to use some pseudo-elements fairly randomly.

MozReview-Commit-ID: b44DO8qcfD
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/dom.rs, components/style/stylist.rs
  • @canaltinova: components/style/dom.rs, components/style/stylist.rs

@highfive
Copy link

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 27, 2017
@emilio
Copy link
Member Author

emilio commented Sep 27, 2017

r? @aethanyc or @heycam

aethanyc
aethanyc approved these changes Sep 27, 2017
View reviewed changes
Copy link
Contributor

@aethanyc aethanyc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=TYLin

components/style/stylist.rs Outdated
applicable_declarations,
);
let cut_off_inheritance = element.each_xbl_stylist(|stylist| {
// nsXBLPrototypeResources::LoadResources() loads Chrome XBL style
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you're here, please s/nsXBLPrototypeResources::LoadResources()/ ServoStyleSet::CreateXBLServoStyleSet()/, and delete "Chrome" in the comment because author XBL stylesheets also added under eAuthorSheetFeatures level.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks for the review! :)

@emilio
style: Fix various issues with XBL rule matching.
19d34b9 
We were using the wrong MatchingMode and flags setter just because we didn't
bother threading them down.

This patch fixes the issue seen with the video controls.

MozReview-Commit-ID: Il1WOzRDxI1
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
@emilio
Copy link
Member Author

emilio commented Sep 27, 2017

@bors-servo r=TYLin

@bors-servo
Copy link
Contributor

📌 Commit 19d34b9 has been approved by TYLin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 27, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 19d34b9 with merge bad77b6...

bors-servo pushed a commit that referenced this pull request Sep 27, 2017
Auto merge of #18652 - emilio:xbl-stuff, r=TYLin
bad77b6 
style: Fix various issues with XBL rule matching

See the commit details.

<!-- 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/18652)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ 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
Approved by: TYLin
Pushing bad77b6 to master...

@bors-servo bors-servo merged commit 19d34b9 into servo:master Sep 27, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 27, 2017
@msujaws
Copy link

msujaws commented Oct 7, 2017

This commit caused https://bugzilla.mozilla.org/show_bug.cgi?id=1405526

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aethanyc aethanyc aethanyc approved these changes

Assignees

@metajack metajack

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@emilio @highfive @bors-servo @msujaws @aethanyc @metajack