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

Use new DisplayListBuilder improvements in Servo #14386

Merged
merged 1 commit into from Nov 29, 2016

Conversation

@mrobinson
Copy link
Member

mrobinson commented Nov 28, 2016


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #__ (github issue number if applicable).
  • There are tests for these changes OR
  • These changes do not require tests because they should not change behavior.

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.


This change is Reviewable

@highfive
Copy link

highfive commented Nov 28, 2016

Heads up! This PR modifies the following files:

  • @emilio: components/layout/webrender_helpers.rs
@highfive
Copy link

highfive commented Nov 28, 2016

warning Warning warning

  • These commits modify layout code, but no tests are modified. Please consider adding a test!
@mrobinson
Copy link
Member Author

mrobinson commented Nov 28, 2016

r? @glennw or anyone else interested in reviewing a WebRender update.

@highfive highfive assigned glennw and unassigned cbrewster Nov 28, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2016

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

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.
@mrobinson mrobinson force-pushed the mrobinson:display-list-builder-updates branch from 8ea9557 to 3c1c036 Nov 28, 2016
@glennw
Copy link
Member

glennw commented Nov 28, 2016

@mrobinson Looks like ports/cef/Cargo.lock didn't get updated? r=me after that is fixed and rebased.

@mrobinson
Copy link
Member Author

mrobinson commented Nov 28, 2016

@glennw I think this file has been removed after #14381. I don't think there is anything else do do beyond what ./mach update-cargo does. Given that, I think this is safe to land. Thanks for the review!

@glennw
Copy link
Member

glennw commented Nov 28, 2016

@mrobinson Ah great, r=me then when rebased.

@mrobinson
Copy link
Member Author

mrobinson commented Nov 28, 2016

@bors-servo r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2016

📌 Commit 3c1c036 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Nov 28, 2016

Testing commit 3c1c036 with merge 9bc21f4...

bors-servo added a commit that referenced this pull request Nov 28, 2016
Use new DisplayListBuilder improvements in Servo

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

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

bors-servo commented Nov 28, 2016

💔 Test failed - linux-rel-wpt

@glennw
Copy link
Member

glennw commented Nov 28, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

Testing commit 3c1c036 with merge e3e1412...

bors-servo added a commit that referenced this pull request Nov 29, 2016
Use new DisplayListBuilder improvements in Servo

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

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

bors-servo commented Nov 29, 2016

💔 Test failed - linux-rel-wpt

@glennw
Copy link
Member

glennw commented Nov 29, 2016

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

Testing commit 3c1c036 with merge 0901f79...

bors-servo added a commit that referenced this pull request Nov 29, 2016
Use new DisplayListBuilder improvements in Servo

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

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

bors-servo commented Nov 29, 2016

💔 Test failed - linux-rel-wpt

@mrobinson
Copy link
Member Author

mrobinson commented Nov 29, 2016

All tests passed, but looks like there was an issue with the filter-intermittents step.

Error running mach:

    ['filter-intermittents', 'wpt-errorsummary.log', '--log-intermittents', 'intermittents.log', '--log-filteredsummary', 'filtered-wpt-errorsummary.log', '--use-tracker']

The error occurred in code that was called by the mach command. This is either
a bug in the called code itself or in the way that mach is calling it.

You should consider filing a bug for this issue.

If filing a bug, please include the full output of mach, including this error
message.

The details of the failure are as follows:

HTTPError: HTTP Error 403: Forbidden

I ran this locally and it worked, so I'll retry.

@mrobinson
Copy link
Member Author

mrobinson commented Nov 29, 2016

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

Previous build results for arm32, arm64, linux-dev, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-dev are reusable. Rebuilding only linux-rel-css, linux-rel-wpt...

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

💔 Test failed - linux-rel-css

@mrobinson
Copy link
Member Author

mrobinson commented Nov 29, 2016

HTTPError: HTTP Error 403: Forbidden

Seems to be the same issue with filter-intermittents. I'm really not sure what is going on here.

@mrobinson
Copy link
Member Author

mrobinson commented Nov 29, 2016

@bors-servo retry

This looks like an infrastructure issue. Other builder have succeeded so I'm going to retry this one more time.

@bors-servo
Copy link
Contributor

bors-servo commented Nov 29, 2016

Testing commit 3c1c036 with merge 1c69631...

bors-servo added a commit that referenced this pull request Nov 29, 2016
Use new DisplayListBuilder improvements in Servo

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should not change behavior.

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

In particular, we no longer to have a WebRenderFrameBuilder. All of the
complication is now handled by the DisplayListBuilder itself.

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

bors-servo commented Nov 29, 2016

@bors-servo bors-servo merged commit 3c1c036 into servo:master Nov 29, 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
@mrobinson mrobinson deleted the mrobinson:display-list-builder-updates branch Jan 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.