Fix restyling on viewport resize. #12838

emilio · 2016-08-12T23:34:01Z

Fixes #12835

./mach build -d does not report any errors
./mach test-tidy does not report any errors

There are tests for these changes OR

This change is

highfive · 2016-08-12T23:34:05Z

Heads up! This PR modifies the following files:

@bholley: components/style/lib.rs, components/style/custom_properties.rs, components/style/traversal.rs, components/style/stylesheets.rs, components/style/selector_matching.rs, components/style/properties/properties.mako.rs, components/style/properties/helpers.mako.rs, components/style/values/specified/mod.rs, components/style/cascade_info.rs, components/style/animation.rs, components/style/matching.rs

highfive · 2016-08-12T23:34:06Z

Warning

These commits modify unsafe code. Please review it carefully!

emilio · 2016-08-12T23:36:23Z

r? @SimonSapin

bors-servo · 2016-08-14T08:34:45Z

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


        layout: Mark correctly parents of dirty elements.


        style: Correcly track whether calc values support viewport sizes.

emilio · 2016-08-14T08:38:33Z

@bors-servo try

bors-servo · 2016-08-14T08:38:35Z

⌛ Trying commit b00bf27 with merge 711c4f0...


        Auto merge of #12838 - emilio:viewport, r=<try>

Fix restyling on viewport resize.  Fixes #12835 ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  - [x] There are tests for these changes OR   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12838)

emilio · 2016-08-14T08:50:05Z

@bors-servo: try

bors-servo · 2016-08-14T15:53:07Z

⌛ Trying commit c3bcf4d with merge 559b3e9...


        Auto merge of #12838 - emilio:viewport, r=<try>

Fix restyling on viewport resize.  Fixes #12835 ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  - [x] There are tests for these changes OR   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12838)

bors-servo · 2016-08-14T15:56:17Z

💔 Test failed - linux-rel

emilio · 2016-08-14T22:24:20Z

@bors-servo: try

Apparently the syntax:

if cfg!(whatever) {
    self.field_only_existing_if_cfg_whatever = foo;
}

~~broke with the rustup~~ I'm stupid.

bors-servo · 2016-08-14T22:24:23Z

⌛ Trying commit 4ab6eaa with merge 56c790b...


        Auto merge of #12838 - emilio:viewport, r=<try>

Fix restyling on viewport resize.  Fixes #12835 ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  - [x] There are tests for these changes OR   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12838)

eddyb · 2016-08-14T22:29:45Z

@emilio That never worked, if false doesn't make typeck ignore the field access.

emilio · 2016-08-14T22:52:50Z

FTR, yeah, @eddyb is right, and I'm stupid for misremembering having built this on release locally before the rustup.

bors-servo · 2016-08-15T09:11:16Z

💥 Test timed out

SimonSapin · 2016-08-16T12:43:56Z

r=me with s/red/green/ if you’ve seen the test fail

Reviewed 1 of 1 files at r1, 2 of 2 files at r2, 12 of 12 files at r3, 1 of 1 files at r4.
Review status: all files reviewed at latest revision, 2 unresolved discussions, some commit checks failed.

tests/wpt/mozilla/tests/css/dirty_viewport.html, line 7 [r3] (raw file):

<iframe seamless src="dirty_viewport_inner.html" width="500" height="500"></iframe>
<script>
  window.onload = function() {

Did this test fail without the code changes?

tests/wpt/mozilla/tests/css/dirty_viewport_ref.html, line 4 [r3] (raw file):

<style>
  div {
    background: red;

Nit: red is generally used to indicate a test failure. (On success, it the red is hidden/behind something else). Please change this to green.

Comments from Reviewable


        style: Introduce a generic way of gathering information from the casc…

…ade, and use it for viewport units.


        style: Remove the block that explicitly checked for the style attribu…

…te, since now it's useless.

emilio · 2016-08-16T18:02:12Z

@bors-servo: r=SimonSapin

Review status: 13 of 16 files reviewed at latest revision, 2 unresolved discussions.

tests/wpt/mozilla/tests/css/dirty_viewport.html, line 7 [r3] (raw file):

Previously, SimonSapin (Simon Sapin) wrote…

Did this test fail without the code changes?

Yep, that's the first thing I tested, but just in case I double-checked :P

tests/wpt/mozilla/tests/css/dirty_viewport_ref.html, line 4 [r3] (raw file):

Previously, SimonSapin (Simon Sapin) wrote…

Nit: red is generally used to indicate a test failure. (On success, it the red is hidden/behind something else). Please change this to green.

Done.

Comments from Reviewable

bors-servo · 2016-08-16T18:02:15Z

📌 Commit fc12841 has been approved by SimonSapin

bors-servo · 2016-08-16T18:48:21Z

⌛ Testing commit fc12841 with merge 49431be...


        Auto merge of #12838 - emilio:viewport, r=SimonSapin

Fix restyling on viewport resize.  Fixes #12835 ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors  - [x] There are tests for these changes OR   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12838)

bors-servo · 2016-08-16T19:46:18Z

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

highfive assigned metajack Aug 12, 2016

highfive added the S-awaiting-review label Aug 12, 2016

highfive assigned SimonSapin and unassigned metajack Aug 12, 2016

highfive added the S-needs-rebase label Aug 14, 2016

emilio added 2 commits Aug 12, 2016

layout: Mark correctly parents of dirty elements.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

b1fca78

style: Correcly track whether calc values support viewport sizes.

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

40c04b4

emilio force-pushed the emilio:viewport branch from a7baf95 to b00bf27 Aug 14, 2016

emilio force-pushed the emilio:viewport branch from b00bf27 to c3bcf4d Aug 14, 2016

highfive added the S-tests-failed label Aug 14, 2016

emilio force-pushed the emilio:viewport branch from c3bcf4d to 4ab6eaa Aug 14, 2016

highfive removed the S-tests-failed label Aug 14, 2016

emilio removed the S-needs-rebase label Aug 15, 2016

emilio added 2 commits Aug 12, 2016

style: Introduce a generic way of gathering information from the casc…

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

9e88a49

…ade, and use it for viewport units.

style: Remove the block that explicitly checked for the style attribu…

Unverified

This user has not uploaded their public key yet.

GPG key ID: 056B727BB9C1027C Learn about signing commits

Loading status checks…

fc12841

…te, since now it's useless.

emilio force-pushed the emilio:viewport branch from 4ab6eaa to fc12841 Aug 16, 2016

highfive added S-awaiting-merge and removed S-awaiting-review labels Aug 16, 2016

bors-servo merged commit fc12841 into servo:master Aug 16, 2016
3 checks passed

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

highfive removed the S-awaiting-merge label Aug 16, 2016

emilio deleted the emilio:viewport branch Aug 16, 2016

servo / servo

Fix restyling on viewport resize. #12838

Fix restyling on viewport resize. #12838

emilio commented Aug 12, 2016 •

edited by larsbergstrom

highfive commented Aug 12, 2016

highfive commented Aug 12, 2016

emilio commented Aug 12, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016 •

edited by notriddle

bors-servo commented Aug 14, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016 •

edited

bors-servo commented Aug 14, 2016

eddyb commented Aug 14, 2016

emilio commented Aug 14, 2016 •

edited

bors-servo commented Aug 15, 2016

SimonSapin commented Aug 16, 2016

emilio commented Aug 16, 2016

bors-servo commented Aug 16, 2016

bors-servo commented Aug 16, 2016

bors-servo commented Aug 16, 2016

servo / servo

Join GitHub today

Fix restyling on viewport resize. #12838

Fix restyling on viewport resize. #12838

Conversation

emilio commented Aug 12, 2016 • edited by larsbergstrom

highfive commented Aug 12, 2016

highfive commented Aug 12, 2016

emilio commented Aug 12, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016 • edited by notriddle

bors-servo commented Aug 14, 2016

bors-servo commented Aug 14, 2016

emilio commented Aug 14, 2016 • edited

bors-servo commented Aug 14, 2016

eddyb commented Aug 14, 2016

emilio commented Aug 14, 2016 • edited

bors-servo commented Aug 15, 2016

SimonSapin commented Aug 16, 2016

emilio commented Aug 16, 2016

bors-servo commented Aug 16, 2016

bors-servo commented Aug 16, 2016

bors-servo commented Aug 16, 2016

emilio commented Aug 12, 2016 •

edited by larsbergstrom

emilio commented Aug 14, 2016 •

edited by notriddle

emilio commented Aug 14, 2016 •

edited

emilio commented Aug 14, 2016 •

edited