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

stylo: only clear relevant origins when medium features change #18070

Merged
merged 3 commits into from Aug 14, 2017
Merged

stylo: only clear relevant origins when medium features change #18070

merged 3 commits into from Aug 14, 2017

Conversation

emilio
Copy link
Member

@emilio emilio commented Aug 14, 2017 •
edited by SimonSapin

Bug: 1389871
Reviewed-by: heycam

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @bholley: components/style/stylesheets/origin.rs, components/style/gecko_bindings/sugar/origin_flags.rs, components/style/gecko_bindings/sugar/mod.rs, components/style/stylesheets/mod.rs, components/style/stylist.rs
  • @canaltinova: components/style/stylesheets/origin.rs, components/style/gecko_bindings/sugar/origin_flags.rs, components/style/gecko_bindings/sugar/mod.rs, components/style/stylesheets/mod.rs, components/style/stylist.rs

@highfive
Copy link

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • 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 Aug 14, 2017
@emilio
Copy link
Member Author

emilio commented Aug 14, 2017

@bors-servo r=heycam p=1

  • coordiland

@bors-servo
Copy link
Contributor

📌 Commit ab9c338 has been approved by heycam

@highfive highfive assigned heycam and unassigned nox Aug 14, 2017
@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 Aug 14, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit ab9c338 with merge 8bd5ddb...

bors-servo pushed a commit that referenced this pull request Aug 14, 2017
Auto merge of #18070 - emilio:orig-medium, r=heycam
8bd5ddb 
stylo: only clear relevant origins when medium features change

Bug: 1389871
Reviewed-by: heycam

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

💔 Test failed - linux-dev

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

☔ The latest upstream changes (presumably #18067) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Aug 14, 2017
@emilio
Copy link
Member Author

emilio commented Aug 14, 2017

@bors-servo r=heycam

@bors-servo
Copy link
Contributor

📌 Commit bd74d7f has been approved by heycam

@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. S-needs-rebase There are merge conflict errors. labels Aug 14, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit bd74d7f with merge 1573309...

bors-servo pushed a commit that referenced this pull request Aug 14, 2017
Auto merge of #18070 - emilio:orig-medium, r=heycam
1573309 
stylo: only clear relevant origins when medium features change

Bug: 1389871
Reviewed-by: heycam

<!-- 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/18070)
<!-- 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: heycam
Pushing 1573309 to master...

@bors-servo bors-servo merged commit bd74d7f into servo:master Aug 14, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Aug 14, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@heycam heycam

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@emilio @highfive @bors-servo @nox @heycam