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

Fix merging text shadow primitives during batch merging. #2515

Merged
merged 1 commit into from Mar 14, 2018

Conversation

@glennw
Copy link
Member

glennw commented Mar 13, 2018

Fixes #2508.


This change is Reviewable

@glennw
Copy link
Member Author

glennw commented Mar 13, 2018

r? @gankro or anyone

I expect this to fail on CI - for some reason my machine generates different text layout that CI, which I haven't looked into yet. I'll pull the CI generated reftest image from this CI run and use that.

@Gankra
Copy link
Contributor

Gankra commented Mar 14, 2018

r=me with the test image fixed

@glennw glennw force-pushed the glennw:fix-shadow-merging branch from 9b3f79a to b08d132 Mar 14, 2018
@glennw glennw force-pushed the glennw:fix-shadow-merging branch from b08d132 to 7180ef7 Mar 14, 2018
@glennw
Copy link
Member Author

glennw commented Mar 14, 2018

@bors-servo r=Gankro

@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2018

📌 Commit 7180ef7 has been approved by Gankro

@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2018

Testing commit 7180ef7 with merge 6f3d2bb...

bors-servo added a commit that referenced this pull request Mar 14, 2018
Fix merging text shadow primitives during batch merging.

Fixes #2508.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2515)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2018

💔 Test failed - status-travis

@glennw
Copy link
Member Author

glennw commented Mar 14, 2018

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2018

Testing commit 7180ef7 with merge a7ce687...

bors-servo added a commit that referenced this pull request Mar 14, 2018
Fix merging text shadow primitives during batch merging.

Fixes #2508.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2515)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Mar 14, 2018

☀️ Test successful - status-appveyor, status-taskcluster, status-travis
Approved by: Gankro
Pushing a7ce687 to master...

@bors-servo bors-servo merged commit 7180ef7 into servo:master Mar 14, 2018
3 checks passed
3 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
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

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