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

Implemented paint worklets drawing to a border. #17862

Merged
merged 1 commit into from Sep 18, 2017

Conversation

asajeffrey
Copy link
Member

@asajeffrey asajeffrey commented Jul 26, 2017

Allow paint worklets to draw to a border.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix Paint worklets: support paint in border-image #17451.
  • These changes do not require tests because the existing css-paint-api test check this (but annoyingly, all fail for other reasons)

This change is Reviewable

@asajeffrey asajeffrey added A-content/css Interacting with CSS from web content (parsing, serializing, introspection) A-content/script Related to the script thread labels Jul 26, 2017
@highfive
Copy link

Heads up! This PR modifies the following files:

  • @emilio: components/layout/display_list_builder.rs

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 26, 2017
@jdm jdm added the S-needs-rebase There are merge conflict errors. label Jul 26, 2017
@asajeffrey asajeffrey removed the S-needs-rebase There are merge conflict errors. label Jul 26, 2017
@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 31, 2017
&clip,
paint_worklet,
i);
let size = self.border_box - style.logical_border_width();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Isn't there a content_box() method for this?)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content_box method doesn't include the padding though.

@bors-servo
Copy link
Contributor

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

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Aug 7, 2017
@asajeffrey asajeffrey removed the S-needs-rebase There are merge conflict errors. label Aug 9, 2017
@asajeffrey
Copy link
Member Author

@pcwalton ping?

@pcwalton
Copy link
Contributor

@bors-servo: r+

@bors-servo
Copy link
Contributor

📌 Commit 3f71be7 has been approved by pcwalton

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 18, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 3f71be7 with merge a5282ca...

bors-servo pushed a commit that referenced this pull request Sep 18, 2017
…lton

Implemented paint worklets drawing to a border.

<!-- Please describe your changes on the following line: -->

Allow paint worklets to draw to a border.

---
<!-- 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
- [X] These changes fix #17451.
- [X] These changes do not require tests because the existing css-paint-api test check this (but annoyingly, all fail for other reasons)

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

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: pcwalton
Pushing a5282ca to master...

@bors-servo bors-servo merged commit 3f71be7 into servo:master Sep 18, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 18, 2017
@asajeffrey
Copy link
Member Author

@pcwalton: thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-content/css Interacting with CSS from web content (parsing, serializing, introspection) A-content/script Related to the script thread
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Paint worklets: support paint in border-image
5 participants