Skip to content

/ servo

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
Merged

Implemented paint worklets drawing to a border. #17862

merged 1 commit into from Sep 18, 2017

Conversation

@asajeffrey
Copy link
Member

asajeffrey commented Jul 26, 2017 •
edited by larsbergstrom

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 #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
@highfive
Copy link

highfive commented Jul 26, 2017

Heads up! This PR modifies the following files:

  • @emilio: components/layout/display_list_builder.rs
@jdm jdm added the S-needs-rebase label Jul 26, 2017
@asajeffrey asajeffrey force-pushed the asajeffrey:script-paint-worklet-border branch from 437d785 to 26598d2 Jul 26, 2017
@bors-servo
Copy link
Contributor

bors-servo commented Jul 31, 2017

☔ The latest upstream changes (presumably #17810) made this pull request unmergeable. Please resolve the merge conflicts.
@asajeffrey asajeffrey force-pushed the asajeffrey:script-paint-worklet-border branch from 26598d2 to c95d2e5 Jul 31, 2017
@pcwalton
pcwalton reviewed Aug 7, 2017
View changes
components/layout/display_list_builder.rs Outdated
&clip,
paint_worklet,
i);
let size = self.border_box - style.logical_border_width();

This comment has been minimized.

Sign in to view
@pcwalton

pcwalton Aug 7, 2017

Contributor

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

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey Aug 9, 2017

Author Member

The content_box method doesn't include the padding though.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 7, 2017

☔ The latest upstream changes (presumably #17845) made this pull request unmergeable. Please resolve the merge conflicts.
@asajeffrey
Implemented paint worklets drawing to a border.
Loading status checks…
3f71be7
@asajeffrey asajeffrey force-pushed the asajeffrey:script-paint-worklet-border branch from c95d2e5 to 3f71be7 Aug 9, 2017
@asajeffrey
Copy link
Member Author

asajeffrey commented Sep 18, 2017

@pcwalton ping?
@pcwalton
Copy link
Contributor

pcwalton commented Sep 18, 2017

@bors-servo: r+
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2017

📌 Commit 3f71be7 has been approved by pcwalton
@bors-servo
Copy link
Contributor

bors-servo commented Sep 18, 2017

⌛ Testing commit 3f71be7 with merge a5282ca...
bors-servo added a commit that referenced this pull request Sep 18, 2017
@bors-servo
Auto merge of #17862 - asajeffrey:script-paint-worklet-border, r=pcwa…
Loading status checks…
a5282ca 
…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

bors-servo commented Sep 18, 2017

☀️ 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
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@asajeffrey
Copy link
Member Author

asajeffrey commented Sep 18, 2017

@pcwalton: thanks!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pcwalton pcwalton

Assignees

@pcwalton pcwalton

Labels
A-content/css A-content/script
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

Paint worklets: support paint in border-image
5 participants
@asajeffrey @highfive @bors-servo @pcwalton @jdm
You can’t perform that action at this time.