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

Update to webrender 0.4.0 #12925

Merged
merged 1 commit into from
Aug 18, 2016
Merged

Update to webrender 0.4.0 #12925

merged 1 commit into from
Aug 18, 2016

Conversation

nox
Copy link
Contributor

@nox nox commented Aug 18, 2016 •
edited by larsbergstrom
Loading

This change is Reviewable

@highfive
Copy link

Heads up! This PR modifies the following files:

  • @asajeffrey: components/constellation/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/script/Cargo.toml

@highfive
Copy link

warning Warning warning

  • These commits modify net, layout, gfx, and script 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 18, 2016
@Ms2ger
Copy link
Contributor

Ms2ger commented Aug 18, 2016

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit a9f6aca has been approved by Ms2ger

@highfive highfive assigned Ms2ger and unassigned glennw Aug 18, 2016
@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 18, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit a9f6aca with merge 3ec0a1e...

bors-servo pushed a commit that referenced this pull request Aug 18, 2016
Auto merge of #12925 - nox:wr-merge, r=Ms2ger
3ec0a1e 
Update to webrender 0.4.0

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

💔 Test failed - linux-rel

@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 18, 2016
@highfive
Copy link 

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/perspective-origin-004.htm
  └   → /css-transforms-1_dev/html/perspective-origin-004.htm 68d5e8d6d5edcd2bef5ecaaf62cbbbac863dee22
/css-transforms-1_dev/html/reference/ref-filled-green-100px-square.htm d4aa213e3e31e41d0d8e84aec79e94f860f27178
Testing 68d5e8d6d5edcd2bef5ecaaf62cbbbac863dee22 == d4aa213e3e31e41d0d8e84aec79e94f860f27178

  ▶ FAIL [expected PASS] /css-transforms-1_dev/html/perspective-origin-002.htm
  └   → /css-transforms-1_dev/html/perspective-origin-002.htm 68d5e8d6d5edcd2bef5ecaaf62cbbbac863dee22
/css-transforms-1_dev/html/reference/ref-filled-green-100px-square.htm d4aa213e3e31e41d0d8e84aec79e94f860f27178
Testing 68d5e8d6d5edcd2bef5ecaaf62cbbbac863dee22 == d4aa213e3e31e41d0d8e84aec79e94f860f27178

@nox
Copy link
Contributor Author

nox commented Aug 18, 2016 •
edited
Loading

@bors-servo retry #12891

@nox
Copy link
Contributor Author

nox commented Aug 18, 2016

@bors-servo p=1

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Aug 18, 2016
@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 18, 2016
@nox
Copy link
Contributor Author

nox commented Aug 18, 2016

@bors-servo r=Ms2ger

@bors-servo
Copy link
Contributor

📌 Commit 03a0170 has been approved by Ms2ger

@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 18, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 03a0170 with merge c769db6...

bors-servo pushed a commit that referenced this pull request Aug 18, 2016
Auto merge of #12925 - nox:wr-merge, r=Ms2ger
c769db6 
Update to webrender 0.4.0

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

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

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

@Ms2ger Ms2ger

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nox @highfive @Ms2ger @bors-servo @glennw