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 more WebRender types in gfx #19824

Merged
merged 1 commit into from Jan 30, 2018
Merged

Use more WebRender types in gfx #19824

merged 1 commit into from Jan 30, 2018

Conversation

@pyfisch
Copy link
Contributor

pyfisch commented Jan 20, 2018

Removes ImageBorder details from gfx.
Use WebRender BorderRadius in BoxShadow.
Stores cursors as integer.
Use FilterOp, BorderWidths from WebRender.
Store content_rect as LayoutRect.

This amends #19782.


This change is Reviewable

@highfive
Copy link

highfive commented Jan 20, 2018

Heads up! This PR modifies the following files:

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

highfive commented Jan 20, 2018

warning Warning warning

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

pyfisch commented Jan 20, 2018

@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2018

Trying commit 46b9b52 with merge 4a2aa7c...

bors-servo added a commit that referenced this pull request Jan 20, 2018
Use more WebRender types in gfx

Removes ImageBorder details from gfx.
Use WebRender BorderRadius in BoxShadow.
Stores cursors as integer.
Use FilterOp, BorderWidths from WebRender.
Store content_rect as LayoutRect.

This amends #19782.

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

bors-servo commented Jan 20, 2018

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

@bors-servo
Copy link
Contributor

bors-servo commented Jan 20, 2018

@pyfisch pyfisch force-pushed the pyfisch:dl-move branch from 46b9b52 to e46c94b Jan 21, 2018
@pyfisch
Copy link
Contributor Author

pyfisch commented Jan 21, 2018

Rebased.

@jdm
Copy link
Member

jdm commented Jan 22, 2018

r? @glennw

@highfive highfive assigned glennw and unassigned asajeffrey Jan 22, 2018
@pyfisch
Copy link
Contributor Author

pyfisch commented Jan 29, 2018

r? @mrobinson

As you already reviewed the previous PR (#19782) can you have a look here too?

The S-needs-rebase is outdated.

@highfive highfive assigned mrobinson and unassigned glennw Jan 29, 2018
Copy link
Member

mrobinson left a comment

This looks really great. Feel free to land when the nit is fixed.

},
let details = match border_style_struct.border_image_source {
Either::First(_) => Some(BorderDetails::Normal(NormalBorder {
left: webrender_api::BorderSide {

This comment has been minimized.

@mrobinson

mrobinson Jan 29, 2018

Member

I think it would be better to just include BorderSide and use it directly.

@mrobinson
Copy link
Member

mrobinson commented Jan 29, 2018

@bors-servo delegate+

@bors-servo
Copy link
Contributor

bors-servo commented Jan 29, 2018

✌️ @pyfisch can now approve this pull request

Removes ImageBorder details from gfx.
Use WebRender BorderRadius in BoxShadow.
Stores cursors as integer.
Use FilterOp, BorderWidths from WebRender.
Store content_rect as LayoutRect.
@pyfisch pyfisch force-pushed the pyfisch:dl-move branch from e46c94b to 8bb50ac Jan 30, 2018
@pyfisch
Copy link
Contributor Author

pyfisch commented Jan 30, 2018

@bors-servo r+ r=mrobinson

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2018

📌 Commit 8bb50ac has been approved by mrobinson

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2018

💡 This pull request was already approved, no need to approve it again.

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2018

📌 Commit 8bb50ac has been approved by pyfisch

@bors-servo
Copy link
Contributor

bors-servo commented Jan 30, 2018

Testing commit 8bb50ac with merge bad4638...

bors-servo added a commit that referenced this pull request Jan 30, 2018
Use more WebRender types in gfx

Removes ImageBorder details from gfx.
Use WebRender BorderRadius in BoxShadow.
Stores cursors as integer.
Use FilterOp, BorderWidths from WebRender.
Store content_rect as LayoutRect.

This amends #19782.

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

bors-servo commented Jan 30, 2018

@bors-servo bors-servo merged commit 8bb50ac into servo:master Jan 30, 2018
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
@pyfisch pyfisch deleted the pyfisch:dl-move branch Jan 30, 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

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