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

Update WR (text-shadow improvements, iframe + image clips, depth buffer sharing) #17771

Merged
merged 3 commits into from Jul 18, 2017

Conversation

@mrobinson
Copy link
Member

mrobinson commented Jul 18, 2017


  • ./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 _____

This change is Reviewable

Also includes an incidental bugfix for the rendering order of text decorations.

This change depends on servo/webrender#1454 being merged and upstreamed to servo.
@highfive
Copy link

highfive commented Jul 18, 2017

Heads up! This PR modifies the following files:

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

highfive commented Jul 18, 2017

warning Warning warning

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

mrobinson commented Jul 18, 2017

This was #17765. I'm opening a new PR in order to land the rebase of that PR.

@mrobinson
Copy link
Member Author

mrobinson commented Jul 18, 2017

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit 35249f0 has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

Testing commit 35249f0 with merge 199211f...

bors-servo added a commit that referenced this pull request Jul 18, 2017
Update WR (text-shadow improvements, iframe + image clips, depth buffer sharing)

<!-- 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
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

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

bors-servo commented Jul 18, 2017

💔 Test failed - linux-dev

@jdm
Copy link
Member

jdm commented Jul 18, 2017

error[E0412]: cannot find type `ServoComputedValues` in this scope
    --> /home/servo/buildbot/slave/linux-dev/build/components/layout/display_list_builder.rs:1875:41
     |
1875 |         let build_local_clip = |style: &ServoComputedValues| {
     |                                         ^^^^^^^^^^^^^^^^^^^ did you mean `ComputedValues`?

   Compiling constellation v0.0.1 (file:///home/servo/buildbot/slave/linux-dev/build/components/constellation)
error: aborting due to previous error

error: Could not compile `layout`.
mrobinson and others added 2 commits Jul 12, 2017
…er sharing).

Push multiple text shadows in the order WR expects them.
@mrobinson
Copy link
Member Author

mrobinson commented Jul 18, 2017

I did the typical thing which is to fix the rebase locally but forget to commit the changes. I will update this branch.

@mrobinson mrobinson force-pushed the mrobinson:wr-update-shadows branch from 35249f0 to 1b35499 Jul 18, 2017
@mrobinson
Copy link
Member Author

mrobinson commented Jul 18, 2017

@bors-servo r=emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

📌 Commit 1b35499 has been approved by emilio

@bors-servo
Copy link
Contributor

bors-servo commented Jul 18, 2017

Testing commit 1b35499 with merge 988a516...

bors-servo added a commit that referenced this pull request Jul 18, 2017
Update WR (text-shadow improvements, iframe + image clips, depth buffer sharing)

<!-- 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
- [ ] These changes do not require tests because _____

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

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

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

bors-servo commented Jul 18, 2017

@bors-servo bors-servo merged commit 1b35499 into servo:master Jul 18, 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
@mrobinson mrobinson deleted the mrobinson:wr-update-shadows branch Jul 18, 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

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