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

Expose ClipMode in public API. #1867

Merged
merged 1 commit into from Oct 19, 2017
Merged

Expose ClipMode in public API. #1867

merged 1 commit into from Oct 19, 2017

Conversation

@glennw
Copy link
Member

glennw commented Oct 13, 2017

Fixes #1862.


This change is Reviewable

@glennw
Copy link
Member Author

glennw commented Oct 13, 2017

@Gankra
Copy link
Contributor

Gankra commented Oct 13, 2017

Are we ok with doing this before moving ComplexClips out of local clips?

@glennw
Copy link
Member Author

glennw commented Oct 13, 2017

I think so - it's only one extra int, so I don't think it's too bad. And an extra win to be had when to do move complex clips out :) But it's up to you - happy to hold off on it if you prefer.

@glennw glennw force-pushed the glennw:fix-1862 branch from 2ae90f9 to 5233e8d Oct 13, 2017
@mrobinson
Copy link
Member

mrobinson commented Oct 16, 2017

This seems okay to me. I don't think it will affect removing rounded rectangles from LocalClips.

@glennw glennw force-pushed the glennw:fix-1862 branch from 5233e8d to 5574d26 Oct 17, 2017
@glennw
Copy link
Member Author

glennw commented Oct 17, 2017

Rebased.

r? @kvark or @mrobinson

@mrobinson
Copy link
Member

mrobinson commented Oct 17, 2017

@bors-servo
Copy link
Contributor

bors-servo commented Oct 17, 2017

📌 Commit 5574d26 has been approved by mrobinson

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2017

Testing commit 5574d26 with merge e5531c1...

bors-servo added a commit that referenced this pull request Oct 18, 2017
Expose ClipMode in public API.

Fixes #1862.

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

bors-servo commented Oct 18, 2017

💔 Test failed - status-travis

@glennw
Copy link
Member Author

glennw commented Oct 18, 2017

@bors-servo retry

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2017

Testing commit 5574d26 with merge cd5305d...

bors-servo added a commit that referenced this pull request Oct 18, 2017
Expose ClipMode in public API.

Fixes #1862.

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

bors-servo commented Oct 18, 2017

💔 Test failed - status-travis

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2017

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

Fixes #1862.
@glennw glennw force-pushed the glennw:fix-1862 branch from 5574d26 to 69bbb68 Oct 18, 2017
@glennw
Copy link
Member Author

glennw commented Oct 18, 2017

@bors-servo r=mrobinson

@bors-servo
Copy link
Contributor

bors-servo commented Oct 18, 2017

📌 Commit 69bbb68 has been approved by mrobinson

@bors-servo
Copy link
Contributor

bors-servo commented Oct 19, 2017

Testing commit 69bbb68 with merge 0df0df1...

bors-servo added a commit that referenced this pull request Oct 19, 2017
Expose ClipMode in public API.

Fixes #1862.

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

bors-servo commented Oct 19, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: mrobinson
Pushing 0df0df1 to master...

@bors-servo bors-servo merged commit 69bbb68 into servo:master Oct 19, 2017
4 checks passed
4 checks passed
Taskcluster (pull_request) TaskGroup: success
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@staktrace
Copy link
Contributor

staktrace commented Oct 19, 2017

@glennw @mrobinson This PR appears to be causing RenderThread panics in gecko, looks like: GECKO(1114) | thread 'RenderBackend' panicked at 'MEH: malicious input?: Custom("invalid value: integer 3857049061, expected variant index 0 <= i < 2")', /checkout/src/libcore/result.rs:906:4 for example. Do we need to change things on the gecko side?

@staktrace
Copy link
Contributor

staktrace commented Oct 19, 2017

Ah, looks like we need to actually initialize this new clipmode member. I have a patch that I'm testing now.

@glennw glennw deleted the glennw:fix-1862 branch Oct 19, 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

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