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.

Sign up for GitHub

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

Jump to bottom

Implement raqote backend for 2D canvas rendering #24201

Merged
merged 4 commits into from Sep 17, 2019
Merged

Implement raqote backend for 2D canvas rendering #24201

merged 4 commits into from Sep 17, 2019

Conversation

pylbrecht
Copy link
Contributor

@pylbrecht pylbrecht commented Sep 12, 2019 •
edited by jdm

  • There are tests for these changes

This change is Reviewable

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 12, 2019
@jdm
Copy link
Member

jdm commented Sep 16, 2019

I think we should merge these changes after squashing the bitshifting commit and rebasing.

@jdm jdm added S-needs-squash Some (or all) of the commits in the PR should be combined. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 16, 2019
@jdm jdm assigned jdm and unassigned asajeffrey Sep 16, 2019
@jdm jdm added the S-needs-rebase There are merge conflict errors. label Sep 16, 2019
@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 17, 2019
@pylbrecht
Add naive implementation for ellipse()
818b5d4 
rust-azure's ellipse() C++ implementation copy/pasted and kind of ported
to Rust. Obviously needs refactor to turn it into idiomatic Rust.
@pylbrecht
Update raqote
430fad8
@pylbrecht
Implement ColorBurn
b8f9293
@jdm
Copy link
Member

jdm commented Sep 17, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 2a44994 has been approved by jdm

@highfive highfive removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. S-needs-squash Some (or all) of the commits in the PR should be combined. labels Sep 17, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit 2a44994 with merge 052d3d9...

@highfive highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 17, 2019
bors-servo pushed a commit that referenced this pull request Sep 17, 2019
Auto merge of #24201 - pylbrecht:raqote, r=jdm
052d3d9 
Implement raqote backend for 2D canvas rendering

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

---
<!-- 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
- [ ] These changes fix (part of) #23431

<!-- Either: -->
- [ ] There are tests for these changes

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

💔 Test failed - status-taskcluster

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 17, 2019
@CYBAI
Copy link
Member

CYBAI commented Sep 17, 2019

Tidy failure in linux and windows

error: attempt to shift left with overflow
  --> components/canvas/raqote_backend.rs:636:27
   |
636|         let color: u32 = (self.color.alpha << 8 * 3 |
   |                          ^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[deny(exceeding_bitshifts)]` on by default

error: attempt to shift left with overflow
  --> components/canvas/raqote_backend.rs:637:13
   |
637|             self.color.red << 8 * 2 |
   |            ^^^^^^^^^^^^^^^^^^^^^^^

error: attempt to shift left with overflow
  --> components/canvas/raqote_backend.rs:638:13
   |
638|             self.color.green << 8 * 1 |
   |            ^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 3 previous errors

error: Could not compile `canvas`.
warning: build failed, waiting for other jobs to finish...

the mac one failed with #23290 intermittent

@jdm
Copy link
Member

jdm commented Sep 17, 2019

You'll need to cast those u8 values to u32 before shifting.

@pylbrecht
Copy link
Contributor Author

Thanks, I'm already on it! Building takes some time since the rebase..

@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Sep 17, 2019
@jdm
Copy link
Member

jdm commented Sep 17, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 308908e has been approved by jdm

@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 17, 2019
@bors-servo
Copy link
Contributor

⌛ Testing commit 308908e with merge e431a7b...

bors-servo pushed a commit that referenced this pull request Sep 17, 2019
Auto merge of #24201 - pylbrecht:raqote, r=jdm
e431a7b 
Implement raqote backend for 2D canvas rendering

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

---
<!-- 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
- [ ] These changes fix (part of) #23431

<!-- Either: -->
- [ ] There are tests for these changes

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

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: jdm
Pushing e431a7b to master...

@bors-servo bors-servo merged commit 308908e into servo:master Sep 17, 2019
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Sep 17, 2019
@jdm jdm mentioned this pull request Sep 19, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jdm jdm jdm approved these changes

Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@pylbrecht @jdm @bors-servo @CYBAI @asajeffrey @highfive