Allow using CORS filtered image responses as WebGL textures #24340

jdm · 2019-10-01T17:16:15Z

More specifically, this makes the "is this image same origin?" check consider the CORS status of the original response, rather than relying on an overly-strict "is this image's response's URL same-origin with a particular global?" check. To do this, we make the image cache double keyed based on the requested URL as well as the requesting origin, and store the CORS status of the eventual response with the final image that eventually gets sent to the HTMLImageElement consumer.

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #24330 and fix #24368
There are tests for these changes

This change is

highfive · 2019-10-01T17:16:19Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/htmlvideoelement.rs, components/script/dom/canvasrenderingcontext2d.rs, components/script/dom/htmlimageelement.rs, components/script/dom/htmlcanvaselement.rs
@KiChjang: components/script/dom/htmlvideoelement.rs, components/script/dom/canvasrenderingcontext2d.rs, components/net/image_cache.rs, components/net_traits/image/base.rs, components/net_traits/image_cache.rs and 2 more
@emilio: components/layout/context.rs

highfive · 2019-10-01T17:16:21Z

Warning

These commits modify net, layout, and script code, but no tests are modified. Please consider adding a test!

jdm · 2019-10-01T17:16:23Z

@bors-servo try=wpt

bors-servo · 2019-10-01T17:16:33Z

⌛ Trying commit 77a1c6a with merge daef8bd...


        Auto merge of #24340 - jdm:image-cache-cors, r=<try>

Allow using CORS filtered image responses as WebGL textures More specifically, this makes the "is this image same origin?" check consider the CORS status of the original response, rather than relying on an overly-strict "is this image's response's URL same-origin with a particular global?" check. To do this, we make the image cache double keyed based on the requested URL as well as the requesting origin, and store the CORS status of the eventual response with the final image that eventually gets sent to the HTMLImageElement consumer. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24330 - [x] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24340)

jdm · 2019-10-01T17:42:01Z

This change makes the floor appear in http://paulrouget.com/test/bbjs/.

bors-servo · 2019-10-01T17:44:06Z

💔 Test failed - linux-rel-css

jdm · 2019-10-01T18:13:00Z

@bors-servo try=wpt

bors-servo · 2019-10-01T18:13:06Z

⌛ Trying commit 359dfd9 with merge 8657576...


        Auto merge of #24340 - jdm:image-cache-cors, r=<try>

Allow using CORS filtered image responses as WebGL textures More specifically, this makes the "is this image same origin?" check consider the CORS status of the original response, rather than relying on an overly-strict "is this image's response's URL same-origin with a particular global?" check. To do this, we make the image cache double keyed based on the requested URL as well as the requesting origin, and store the CORS status of the eventual response with the final image that eventually gets sent to the HTMLImageElement consumer. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24330 - [x] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24340)

bors-servo · 2019-10-01T18:40:16Z

💔 Test failed - linux-rel-css

jdm · 2019-10-01T21:56:07Z

@asajeffrey Your thoughts on the second commit here would be interesting.

jdm · 2019-10-02T14:13:39Z

r? @Manishearth

paulrouget · 2019-10-03T12:50:36Z

This change makes the floor appear in http://paulrouget.com/test/bbjs/

I changed the demo to use same-domain images.

I tested the PR and it doesn't fix it.

paulrouget · 2019-10-03T13:32:40Z

The demo has moved to http://paulrouget.com/test/bbjs/basic

jdm · 2019-10-03T14:05:43Z

I tested the change and the floor appeared for me :<

paulrouget · 2019-10-03T14:31:15Z

I tested the change and the floor appeared for me :<

It's possible that I changed the demo as you were writing the PR. Or maybe I haven't properly tested your patch.

components/net/image_cache.rs

components/net_traits/image_cache.rs

jdm · 2019-10-03T21:36:33Z

@bors-servo try=wpt

bors-servo · 2019-10-03T21:36:38Z

⌛ Trying commit e6f37b6 with merge d1b95d9...

jdm · 2019-10-07T18:39:06Z

@bors-servo r=Manishearth

bors-servo · 2019-10-07T18:39:07Z

📌 Commit 27c0e0e has been approved by Manishearth

bors-servo · 2019-10-07T19:23:17Z

⌛ Testing commit 27c0e0e with merge b90c28c...


        Auto merge of #24340 - jdm:image-cache-cors, r=Manishearth

Allow using CORS filtered image responses as WebGL textures More specifically, this makes the "is this image same origin?" check consider the CORS status of the original response, rather than relying on an overly-strict "is this image's response's URL same-origin with a particular global?" check. To do this, we make the image cache double keyed based on the requested URL as well as the requesting origin, and store the CORS status of the eventual response with the final image that eventually gets sent to the HTMLImageElement consumer. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24330 and fix #24368 - [x] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24340)

bors-servo · 2019-10-07T20:04:15Z

💔 Test failed - linux-rel-wpt


        Ensure image cache keys on element CORS status.

jdm · 2019-10-07T20:45:02Z

@bors-servo r=Manishearth

bors-servo · 2019-10-07T20:45:03Z

📌 Commit 6dd4096 has been approved by Manishearth

servo-wpt-sync · 2019-10-07T20:46:13Z

Transplanted upstreamable changes to existing PR.

Completed upstream sync of web-platform-test changes at web-platform-tests/wpt#19529.


        Auto merge of #24340 - jdm:image-cache-cors, r=Manishearth

Allow using CORS filtered image responses as WebGL textures More specifically, this makes the "is this image same origin?" check consider the CORS status of the original response, rather than relying on an overly-strict "is this image's response's URL same-origin with a particular global?" check. To do this, we make the image cache double keyed based on the requested URL as well as the requesting origin, and store the CORS status of the eventual response with the final image that eventually gets sent to the HTMLImageElement consumer. --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24330 and fix #24368 - [x] There are tests for these changes  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24340)

bors-servo · 2019-10-07T22:39:42Z

⌛ Testing commit 6dd4096 with merge 75548f4...

bors-servo · 2019-10-08T01:00:45Z

☀️ Test successful - linux-rel-css, linux-rel-wpt, status-taskcluster
Approved by: Manishearth
Pushing 75548f4 to master...

highfive assigned SimonSapin Oct 1, 2019

highfive added the S-awaiting-review label Oct 1, 2019

highfive added the S-tests-failed label Oct 1, 2019

jdm force-pushed the jdm:image-cache-cors branch from 77a1c6a to 359dfd9 Oct 1, 2019

highfive removed the S-tests-failed label Oct 1, 2019

highfive added S-tests-failed and removed S-tests-failed labels Oct 1, 2019

jdm force-pushed the jdm:image-cache-cors branch from ed30fe7 to b6700ac Oct 1, 2019

highfive assigned Manishearth and unassigned SimonSapin Oct 2, 2019

Manishearth approved these changes Oct 3, 2019

View changes

components/net/image_cache.rs Show resolved Hide resolved

components/net_traits/image_cache.rs Show resolved Hide resolved

Manishearth approved these changes Oct 7, 2019

View changes

highfive added S-awaiting-merge and removed S-awaiting-review labels Oct 7, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Oct 7, 2019

Ensure image cache keys on element CORS status.

Loading status checks…

6dd4096

jdm force-pushed the jdm:image-cache-cors branch from 27c0e0e to 6dd4096 Oct 7, 2019

highfive removed the S-tests-failed label Oct 7, 2019

highfive added S-awaiting-review S-awaiting-merge and removed S-awaiting-review labels Oct 7, 2019

bors-servo merged commit 6dd4096 into servo:master Oct 8, 2019
2 of 3 checks passed

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details

Taskcluster (pull_request) TaskGroup: success
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Oct 8, 2019

jdm moved this from TODO:2D to fixed in babylonjs Oct 17, 2019

jdm mentioned this pull request Nov 13, 2019

Images loaded from file:// urls are not meaningfully cached #24720

Closed

servo / servo

Allow using CORS filtered image responses as WebGL textures #24340

Allow using CORS filtered image responses as WebGL textures #24340

jdm commented Oct 1, 2019 •

edited

highfive commented Oct 1, 2019

highfive commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

jdm commented Oct 2, 2019

paulrouget commented Oct 3, 2019

paulrouget commented Oct 3, 2019

jdm commented Oct 3, 2019

paulrouget commented Oct 3, 2019

jdm commented Oct 3, 2019

bors-servo commented Oct 3, 2019

jdm commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 7, 2019

jdm commented Oct 7, 2019

bors-servo commented Oct 7, 2019

servo-wpt-sync commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 8, 2019

servo / servo

Join GitHub today

Allow using CORS filtered image responses as WebGL textures #24340

Allow using CORS filtered image responses as WebGL textures #24340

Conversation

jdm commented Oct 1, 2019 • edited

highfive commented Oct 1, 2019

highfive commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

bors-servo commented Oct 1, 2019

bors-servo commented Oct 1, 2019

jdm commented Oct 1, 2019

jdm commented Oct 2, 2019

paulrouget commented Oct 3, 2019

paulrouget commented Oct 3, 2019

jdm commented Oct 3, 2019

paulrouget commented Oct 3, 2019

jdm commented Oct 3, 2019

bors-servo commented Oct 3, 2019

jdm commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 7, 2019

jdm commented Oct 7, 2019

bors-servo commented Oct 7, 2019

servo-wpt-sync commented Oct 7, 2019

bors-servo commented Oct 7, 2019

bors-servo commented Oct 8, 2019

jdm commented Oct 1, 2019 •

edited