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

Properly handle optimized ClipChain in custom ClipChain nodes #2455

Merged
merged 1 commit into from Feb 23, 2018

Conversation

@mrobinson
Copy link
Member

mrobinson commented Feb 22, 2018

When a node included in a ClipScrollNode ClipChain is optimized away, we need to
ensure that custom ClipChains that rely on that node are using the
original node and not one of the parents. In order to achieve this, we
store a copy of the original ClipChainNode in the ClipScrollNode and use
it when building custom ClipChains.

Fixes #2388.


This change is Reviewable

@mrobinson mrobinson requested a review from glennw Feb 22, 2018
@mrobinson
Copy link
Member Author

mrobinson commented Feb 22, 2018

@glennw
glennw approved these changes Feb 23, 2018
@glennw
Copy link
Member

glennw commented Feb 23, 2018

The change seems fine - let's do a try run though before merging.

@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2018

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

When a node included in a ClipScrollNode ClipChain is optimized away, we need to
ensure that custom ClipChains that rely on that node are using the
original node and not one of the parents. In order to achieve this, we
store a copy of the original ClipChainNode in the ClipScrollNode and use
it when building custom ClipChains.

Fixes #2388.
@mrobinson mrobinson force-pushed the mrobinson:custom-clip-chain-ancestors branch from a9919dc to f32fb92 Feb 23, 2018
@mrobinson
Copy link
Member Author

mrobinson commented Feb 23, 2018

@kvark
Copy link
Member

kvark commented Feb 23, 2018

Looks fairly green to me, thank you!
@bors-servo r=glennw

@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2018

📌 Commit f32fb92 has been approved by glennw

@bors-servo
Copy link
Contributor

bors-servo commented Feb 23, 2018

Testing commit f32fb92 with merge c4cd1c8...

bors-servo added a commit that referenced this pull request Feb 23, 2018
Properly handle optimized ClipChain in custom ClipChain nodes

When a node included in a ClipScrollNode ClipChain is optimized away, we need to
ensure that custom ClipChains that rely on that node are using the
original node and not one of the parents. In order to achieve this, we
store a copy of the original ClipChainNode in the ClipScrollNode and use
it when building custom ClipChains.

Fixes #2388.

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

bors-servo commented Feb 23, 2018

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

@bors-servo bors-servo merged commit f32fb92 into servo:master Feb 23, 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
@mrobinson mrobinson deleted the mrobinson:custom-clip-chain-ancestors branch Apr 26, 2018
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.