Skip to content

/ servo

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

Update WR (preserve-3d, AA improvements) #16860

Merged
merged 1 commit into from May 16, 2017
Merged

Update WR (preserve-3d, AA improvements) #16860

merged 1 commit into from May 16, 2017

Conversation

@glennw
Copy link
Member

glennw commented May 14, 2017 •
edited by larsbergstrom

This change is Reviewable
@highfive
Copy link

highfive commented May 14, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/properties.mako.rs
  • @emilio: components/layout/display_list_builder.rs, components/layout/fragment.rs, components/layout/webrender_helpers.rs, components/style/properties/properties.mako.rs
@glennw
Copy link
Member Author

glennw commented May 14, 2017

The first two commits have already been reviewed in #16775 - this just adds a commit with some updated test expectations.
@glennw
Copy link
Member Author

glennw commented May 14, 2017

@bors-servo try
@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2017

⌛ Trying commit 0371dce with merge 32961b2...
bors-servo added a commit that referenced this pull request May 14, 2017
@bors-servo
Auto merge of #16860 - glennw:preserve3d, r=<try>
Loading status checks…
32961b2 
Update WR (preserve-3d, AA improvements)

<!-- 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/16860)
<!-- Reviewable:end -->
@glennw
Copy link
Member Author

glennw commented May 14, 2017

r? anyone on the last commit - it adds 6 new passes and 1 new fail. The failure is due to a couple of stray pixels due to the ongoing anti-aliasing work.
@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2017

💔 Test failed - mac-rel-css
@glennw
Copy link
Member Author

glennw commented May 14, 2017

@bors-servo retry

  • See if the timeout on mac is consistent.
@bors-servo
Copy link
Contributor

bors-servo commented May 14, 2017

⌛ Trying commit 0371dce with merge 0b4dbe8...
bors-servo added a commit that referenced this pull request May 14, 2017
@bors-servo
Auto merge of #16860 - glennw:preserve3d, r=<try>
Loading status checks…
0b4dbe8 
Update WR (preserve-3d, AA improvements)

<!-- 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/16860)
<!-- Reviewable:end -->
@Manishearth
Copy link
Member

Manishearth commented May 15, 2017

@bors-servo clean retry force
@bors-servo
Copy link
Contributor

bors-servo commented May 15, 2017

⌛ Trying commit 0371dce with merge 2c2594c...
bors-servo added a commit that referenced this pull request May 15, 2017
@bors-servo
Auto merge of #16860 - glennw:preserve3d, r=<try>
Loading status checks…
2c2594c 
Update WR (preserve-3d, AA improvements)

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

bors-servo commented May 15, 2017

💔 Test failed - mac-rel-css
@glennw
Copy link
Member Author

glennw commented May 15, 2017

Looks like a permanent timeout on mac - will try to reproduce locally.
@glennw glennw mentioned this pull request May 15, 2017
Closed
3 of 5 tasks complete
@glennw
Copy link
Member Author

glennw commented May 15, 2017

I can reproduce this locally - it looks like the border tests are taking longer to execute on OSMesa. I'll investigate why tomorrow.
@nox
Copy link
Member

nox commented May 15, 2017

Please squash the expectation commit into kvark's commit.
@nox
Copy link
Member

nox commented May 15, 2017

r? @mbrubeck
@highfive highfive assigned mbrubeck and unassigned nox May 15, 2017
@mbrubeck
Copy link
Contributor

mbrubeck commented May 15, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented May 15, 2017

📌 Commit 0371dce has been approved by mbrubeck
@glennw
Copy link
Member Author

glennw commented May 16, 2017

Squashed the commits and rebased. Added one new test change - disabled https://github.com/servo/servo/pull/16860/files#diff-000446b741b205b52169061e9caf4fb9.

The test in question renders a 160,000 px border, which WR currently times out on with the software rasterizer.

r? anyone for that last change.
@mbrubeck
Copy link
Contributor

mbrubeck commented May 16, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2017

📌 Commit bd260c0 has been approved by mbrubeck
@glennw
Copy link
Member Author

glennw commented May 16, 2017

@bors-servo r-

  • I messed up the commit squashing - will fix up and re-open.
@glennw glennw force-pushed the glennw:preserve3d branch from bd260c0 to 38efc32 May 16, 2017
@mbrubeck
Copy link
Contributor

mbrubeck commented May 16, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2017

📌 Commit 38efc32 has been approved by mbrubeck
@gw3583
Update WR (ellipse border-radius clip, preserve-3d functionality).
Loading status checks…
d175986
@glennw glennw force-pushed the glennw:preserve3d branch from 38efc32 to d175986 May 16, 2017
@glennw
Copy link
Member Author

glennw commented May 16, 2017

@bors-servo r=mbrubeck

  • Pulled across a couple more of the test changes from the previous PR that I accidentally missed.
@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2017

📌 Commit d175986 has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2017

⌛ Testing commit d175986 with merge 180edaa...
bors-servo added a commit that referenced this pull request May 16, 2017
@bors-servo
Auto merge of #16860 - glennw:preserve3d, r=mbrubeck
Loading status checks…
180edaa 
Update WR (preserve-3d, AA improvements)

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

bors-servo commented May 16, 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-msvc-dev
Approved by: mbrubeck
Pushing 180edaa to master...
@bors-servo bors-servo merged commit d175986 into servo:master May 16, 2017
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
This was referenced May 16, 2017
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mbrubeck mbrubeck

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
@glennw @highfive @bors-servo @Manishearth @nox @mbrubeck @gw3583
You can’t perform that action at this time.