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.

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

stylo: Fix adjustment of the display property to save mOriginalDisplay properly. #15742

Merged
merged 1 commit into from Feb 27, 2017

Conversation

Projects
None yet
6 participants
@emilio
Copy link
Member

commented Feb 26, 2017

r? @heycam


This change is Reviewable

@highfive

This comment has been minimized.

Copy link

commented Feb 26, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/gecko.mako.rs, components/style/properties/properties.mako.rs
@highfive

This comment has been minimized.

Copy link

commented Feb 26, 2017

warning Warning warning

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

This comment has been minimized.

Copy link
Member Author

commented Feb 26, 2017

Or, also r? @bzbarsky, if he wants to, I guess ;)

/// which we want to keep.
pub fn set_adjusted_display(&mut self, v: longhands::display::computed_value::T) {
use properties::longhands::display::computed_value::T as Keyword;
let result = match v {

This comment has been minimized.

Copy link
@bzbarsky

bzbarsky Feb 27, 2017

Contributor

Worth factoring this shared code out of set_display and here?

@bzbarsky

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

@bzbarsky: 🔑 Insufficient privileges: Not in reviewers

@Ms2ger

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

@bors-servo r=bzbarsky

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

📌 Commit f695789 has been approved by bzbarsky

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

⌛️ Testing commit f695789 with merge cecbc33...

bors-servo added a commit that referenced this pull request Feb 27, 2017

Auto merge of #15742 - emilio:stylo-orig-display, r=bzbarsky
stylo: Fix adjustment of the display property to save mOriginalDisplay properly.

r? @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/15742)
<!-- Reviewable:end -->

emilio added a commit to servo/saltfs that referenced this pull request Feb 27, 2017

Give Boris review privileges
He's done a bunch of reviews (servo/servo#15742, servo/servo#15691 and a bunch of others unofficially), both as part of stylo as part of the DOM integration.

I think he's trusted enough to have review powers.
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Feb 27, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: bzbarsky
Pushing cecbc33 to master...

@bors-servo bors-servo merged commit f695789 into servo:master Feb 27, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.