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

Canvas: implement global composition and blending. #5757

Merged
merged 1 commit into from Apr 22, 2015
Merged

Canvas: implement global composition and blending. #5757

merged 1 commit into from Apr 22, 2015
+221 −127

Conversation

@mmatyas
Copy link
Contributor

mmatyas commented Apr 20, 2015

Implements https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-globalcompositeoperation.

Review on Reviewable
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented Apr 20, 2015

Critic review: https://critic.hoppipolla.co.uk/r/4731

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.
@bors-servo
Copy link
Contributor

bors-servo commented Apr 21, 2015

☔ The latest upstream changes (presumably #5652) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm
Copy link
Member

jdm commented Apr 21, 2015

Reviewed files:

  • components/canvas/canvas_paint_task.rs @ r1
  • components/script/dom/bindings/trace.rs @ r1
  • components/script/dom/canvasrenderingcontext2d.rs @ r1
  • components/script/dom/webidls/CanvasRenderingContext2D.webidl @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.casesensitive.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.clear.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.darker.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.default.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.highlight.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.nullsuffix.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.over.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.operation.unrecognised.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.destination-atop.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.destination-in.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.destination-out.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.destination-over.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.lighter.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.source-out.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.solid.xor.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.transparent.lighter.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.uncovered.fill.copy.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.uncovered.fill.destination-atop.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.uncovered.fill.destination-in.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.uncovered.fill.source-in.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/2d.composite.uncovered.fill.source-out.html.ini @ r1
  • tests/wpt/metadata/2dcontext/compositing/canvas_compositing_globalcompositeoperation_001.htm.ini @ r1
  • tests/wpt/metadata/2dcontext/drawing-rectangles-to-the-canvas/2d.strokeRect.globalcomposite.html.ini @ r1
  • tests/wpt/metadata/2dcontext/shadows/2d.shadow.composite.1.html.ini @ r1
  • tests/wpt/metadata/2dcontext/shadows/2d.shadow.composite.2.html.ini @ r1
  • tests/wpt/metadata/2dcontext/the-canvas-state/2d.state.saverestore.globalCompositeOperation.html.ini @ r1
  • tests/wpt/metadata/html/dom/interfaces.html.ini @ r1

components/script/dom/canvasrenderingcontext2d.rs, line 425 [r1] (raw file):
Remove scripting.html

components/script/dom/canvasrenderingcontext2d.rs, line 434 [r1] (raw file):
Remove scripting.html

Comments from the review on Reviewable.io
@jdm
Copy link
Member

jdm commented Apr 21, 2015

Reviewed files:

  • components/script/dom/canvasrenderingcontext2d.rs @ r2

Comments from the review on Reviewable.io
@jdm jdm removed the S-awaiting-review label Apr 21, 2015
@mmatyas mmatyas force-pushed the mmatyas:canvas_globalcomposite branch from 2462d10 to 21f5fd4 Apr 22, 2015
@mmatyas
Copy link
Contributor Author

mmatyas commented Apr 22, 2015

Squashed and rebased.
@jdm
Copy link
Member

jdm commented Apr 22, 2015

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

bors-servo commented Apr 22, 2015

📌 Commit 21f5fd4 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

⌛ Testing commit 21f5fd4 with merge ee28c31...
bors-servo pushed a commit that referenced this pull request Apr 22, 2015
bors-servo
Auto merge of #5757 - mmatyas:canvas_globalcomposite, r=jdm
ee28c31 
Implements https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-globalcompositeoperation.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5757)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

💔 Test failed - mac1
@jdm
Copy link
Member

jdm commented Apr 22, 2015 


/2dcontext/compositing/canvas_compositing_globalcompositeoperation_001.htm
--------------------------------------------------------------------------
FAIL [Parent]
@jdm jdm added S-tests-failed and removed S-awaiting-merge labels Apr 22, 2015
@mmatyas
Copy link
Contributor Author

mmatyas commented Apr 22, 2015

Hm, it's weird that just that one test fails. I can't test on Mac, should I restore the test for now?
@jdm
Copy link
Member

jdm commented Apr 22, 2015

It failed on Linux, too: http://build.servo.org/builders/linux2/builds/1508/steps/shell_1/logs/stdio (the other crash there appears to be an intermittent problem opening the X display)
@mmatyas
Canvas: implement global composition and blending.
Loading status checks…
a8343a0
@mmatyas mmatyas force-pushed the mmatyas:canvas_globalcomposite branch from 21f5fd4 to a8343a0 Apr 22, 2015
@mmatyas
Copy link
Contributor Author

mmatyas commented Apr 22, 2015

Ok, I removed that test for now.
@jdm
Copy link
Member

jdm commented Apr 22, 2015

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

bors-servo commented Apr 22, 2015

📌 Commit a8343a0 has been approved by jdm
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

⌛ Testing commit a8343a0 with merge e278e5b...
bors-servo pushed a commit that referenced this pull request Apr 22, 2015
bors-servo
Auto merge of #5757 - mmatyas:canvas_globalcomposite, r=jdm
Loading status checks…
e278e5b 
Implements https://html.spec.whatwg.org/multipage/scripting.html#dom-context-2d-globalcompositeoperation.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5757)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

💔 Test failed - linux2
@jdm
Copy link
Member

jdm commented Apr 22, 2015

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

⚡ Previous build results for android, gonk, linux1, mac1, mac2 are reusable. Rebuilding only linux2...
@bors-servo
Copy link
Contributor

bors-servo commented Apr 22, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2
@bors-servo bors-servo merged commit a8343a0 into servo:master Apr 22, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@mmatyas mmatyas deleted the mmatyas:canvas_globalcomposite branch Nov 14, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@mmatyas @hoppipolla-critic-bot @bors-servo @jdm @highfive
You can’t perform that action at this time.