Auto merge of #16913 - jdm:canvas2d, r=jdm

Make canvas origin clean checks use origin of image response

Adapted from #15887.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15409
- [X] There are tests for these changes

<!-- 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/16913)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-19 10:45:44 -05:00 committed by GitHub
commit 62690887c1
21 changed files with 78 additions and 92 deletions

View file

@ -399550,7 +399550,7 @@
"support"
],
"common/canvas-tests.js": [
"2db347399bee84e76c01a15ca5c0c3006fcd4d4e",
"329e3ae1cfde2ee0525302e6a3260faed3885f28",
"support"
],
"common/css-red.txt": [

View file

@ -1,5 +0,0 @@
[security.drawImage.canvas.redirect.html]
type: testharness
[drawImage of unclean canvas makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.drawImage.image.redirect.html]
type: testharness
[drawImage of different-origin image makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.canvas.fillStyle.redirect.html]
type: testharness
[Setting fillStyle to a pattern of an unclean canvas makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.canvas.strokeStyle.redirect.html]
type: testharness
[Setting strokeStyle to a pattern of an unclean canvas makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.canvas.timing.redirect.html]
type: testharness
[Pattern safety depends on whether the source was origin-clean, not on whether it still is clean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.create.redirect.html]
type: testharness
[Creating an unclean pattern does not make the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.cross.redirect.html]
type: testharness
[Using an unclean pattern makes the target canvas origin-unclean, not the pattern canvas]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.image.fillStyle.redirect.html]
type: testharness
[Setting fillStyle to a pattern of a different-origin image makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.pattern.image.strokeStyle.redirect.html]
type: testharness
[Setting strokeStyle to a pattern of a different-origin image makes the canvas origin-unclean]
expected: FAIL

View file

@ -1,5 +0,0 @@
[security.reset.redirect.html]
type: testharness
[Resetting the canvas state does not reset the origin-clean flag]
expected: FAIL

View file

@ -101,4 +101,5 @@ function addCrossOriginRedirectYellowImage()
img.className = "resource";
img.src = get_host_info().HTTP_ORIGIN + "/common/redirect.py?location=" +
get_host_info().HTTP_REMOTE_ORIGIN + "/images/yellow.png";
document.body.appendChild(img);
}