Implement drawing an image from a CSS style value into a canvas #17634

asajeffrey · 2017-07-07T19:43:25Z

Implemented drawing a CSS style value into a canvas, which is needed for the Houdini CSS Paint API.

This PR is dependent on #17364.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #17432.
These changes do not require tests because the existing CSS paint API wpt test cases test this behaviour.

This change is

highfive · 2017-07-07T19:43:29Z

Heads up! This PR modifies the following files:

@bholley: components/style/servo/restyle_damage.rs
@canaltinova: components/style/servo/restyle_damage.rs
@KiChjang: components/script/dom/webidls/StylePropertyMapReadOnly.webidl, components/script/dom/testworkletglobalscope.rs, components/script/dom/mod.rs, components/script/dom/stylepropertymapreadonly.rs, components/script/dom/window.rs and 15 more
@fitzgen: components/script/dom/webidls/StylePropertyMapReadOnly.webidl, components/script/dom/testworkletglobalscope.rs, components/script/dom/mod.rs, components/script/dom/stylepropertymapreadonly.rs, components/script/dom/window.rs and 15 more
@emilio: components/layout/display_list_builder.rs, components/style/servo/restyle_damage.rs, components/layout/context.rs, components/layout/Cargo.toml, components/layout/lib.rs

highfive · 2017-07-07T19:43:30Z

Warning

These commits modify unsafe code. Please review it carefully!

emilio

Looks reasonable to me... Probably @jdm should take a look for the DOM bits.

emilio · 2017-07-11T15:45:33Z

components/style/servo/restyle_damage.rs

+    // Paint worklets may depend on custom properties,
+    // so if they have changed we should repaint.
+    if old.get_custom_properties() != new.get_custom_properties() {
+        damage.insert(REPAINT);


I think this could be too overkill... Could we do better? I guess this is fine for now.

Not sure how much better we could do, rather annoyingly. We could try to be smart about which properties are being monitored by a paint worklet.

emilio · 2017-07-11T15:45:33Z

components/script/dom/worklet.rs

@@ -388,9 +373,9 @@ impl WorkletThreadRole {
 #[derive(Clone)]
 struct WorkletThreadInit {
    /// Senders
+    primary_sender: Sender<WorkletData>,


All these members would benefit from some documentation.

Not sure what would be added here, other than "the sender to the primary worklet thread" :)

bors-servo · 2017-07-12T00:30:09Z

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

asajeffrey · 2017-07-17T17:05:46Z

The dependent PRs for this one have landed, so this one is ready for review. @emilio suggested I r? @jdm


        PR servo#17634


        PR servo#17634


        PR servo#17634


        PR servo#17634

bors-servo · 2017-07-21T01:22:11Z

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

asajeffrey · 2017-07-21T21:04:20Z

If #17625 is addressed before this lands, e.g. by @brainlessdeveloper in #17812, we can remove base_url from https://github.com/asajeffrey/servo/blob/bf8bcd9a401586d6f0d2e258831e6181d1aaa174/components/script/dom/canvasrenderingcontext2d.rs#L77. URLs should be resolved by style relative to the stylesheet, not by script.

jdm · 2017-07-21T21:21:51Z

components/script/dom/canvasrenderingcontext2d.rs

+    // Any missing image URLs.
+    missing_image_urls: DOMRefCell<Vec<ServoUrl>>,
+    // The base URL for resolving CSS image URL values.
+    // Needed because of https://github.com/servo/servo/issues/17625


Use /// instead //.


        Implement drawing an image from a CSS style value into a canvas.

asajeffrey · 2017-07-21T21:39:44Z

@bors-servo r=jdm

bors-servo · 2017-07-21T21:39:45Z

📌 Commit 2318caf has been approved by jdm

bors-servo · 2017-07-21T21:39:49Z

⌛ Testing commit 2318caf with merge 76ad913...


        Auto merge of #17634 - asajeffrey:canvas-image-css-style-value, r=jdm

Implement drawing an image from a CSS style value into a canvas  Implemented drawing a CSS style value into a canvas, which is needed for the Houdini CSS Paint API. This PR is dependent on #17364. ---  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17432. - [X] These changes do not require tests because the existing CSS paint API wpt test cases test this behaviour.    --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17634)

bors-servo · 2017-07-21T22:47:50Z

☀️ 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: jdm
Pushing 76ad913 to master...

asajeffrey added A-content/canvas A-content/css A-content/script labels Jul 7, 2017

highfive assigned emilio Jul 7, 2017

highfive added the S-awaiting-review label Jul 7, 2017

emilio reviewed Jul 11, 2017

View changes

highfive added the S-needs-rebase label Jul 12, 2017

asajeffrey force-pushed the asajeffrey:canvas-image-css-style-value branch from 17be732 to 7c800a9 Jul 17, 2017

asajeffrey added S-needs-squash and removed S-needs-rebase labels Jul 17, 2017

highfive assigned jdm and unassigned emilio Jul 17, 2017

asajeffrey added a commit to asajeffrey/servo that referenced this pull request Jul 18, 2017

PR servo#17634

9376da5

asajeffrey mentioned this pull request Jul 18, 2017

Paint worklets: one-place cache of results #17779

Closed

4 of 4 tasks complete

asajeffrey added a commit to asajeffrey/servo that referenced this pull request Jul 19, 2017

PR servo#17634

d2496e6

asajeffrey added a commit to asajeffrey/servo that referenced this pull request Jul 20, 2017

PR servo#17634

933372b

asajeffrey mentioned this pull request Jul 20, 2017

Script paint worklets speculative evaluation #17810

Merged

4 of 4 tasks complete

asajeffrey added a commit to asajeffrey/servo that referenced this pull request Jul 20, 2017

PR servo#17634

5efdd90

highfive added the S-needs-rebase label Jul 21, 2017

asajeffrey force-pushed the asajeffrey:canvas-image-css-style-value branch from 7c800a9 to bf8bcd9 Jul 21, 2017

asajeffrey removed the S-needs-rebase label Jul 21, 2017

jdm approved these changes Jul 21, 2017

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Jul 21, 2017

Implement drawing an image from a CSS style value into a canvas.

Loading status checks…

2318caf

asajeffrey force-pushed the asajeffrey:canvas-image-css-style-value branch from bf8bcd9 to 2318caf Jul 21, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Jul 21, 2017

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-squash labels Jul 21, 2017

bors-servo merged commit 2318caf into servo:master Jul 21, 2017
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

highfive removed the S-awaiting-merge label Jul 21, 2017

This was referenced Jul 21, 2017

Script paint worklets arguments #17546

Merged

Fix iframe.onload being fired twice on about:blank. #16091

Closed

servo / servo

Implement drawing an image from a CSS style value into a canvas #17634

Implement drawing an image from a CSS style value into a canvas #17634

asajeffrey commented Jul 7, 2017 •

edited by larsbergstrom

highfive commented Jul 7, 2017

highfive commented Jul 7, 2017

emilio left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Jul 12, 2017

asajeffrey commented Jul 17, 2017

bors-servo commented Jul 21, 2017

asajeffrey commented Jul 21, 2017

This comment has been minimized.

This comment has been minimized.

asajeffrey commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

servo / servo

Join GitHub today

Implement drawing an image from a CSS style value into a canvas #17634

Implement drawing an image from a CSS style value into a canvas #17634

Conversation

asajeffrey commented Jul 7, 2017 • edited by larsbergstrom

highfive commented Jul 7, 2017

highfive commented Jul 7, 2017

emilio left a comment

This comment has been minimized.

emilio Jul 11, 2017

This comment has been minimized.

asajeffrey Jul 11, 2017

This comment has been minimized.

emilio Jul 11, 2017

This comment has been minimized.

asajeffrey Jul 11, 2017

bors-servo commented Jul 12, 2017

asajeffrey commented Jul 17, 2017

bors-servo commented Jul 21, 2017

asajeffrey commented Jul 21, 2017

This comment has been minimized.

jdm Jul 21, 2017

This comment has been minimized.

asajeffrey Jul 21, 2017

asajeffrey commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

bors-servo commented Jul 21, 2017

asajeffrey commented Jul 7, 2017 •

edited by larsbergstrom