From 4957b0fa04815c2a44bb536c6ea7bf9c8f82e37b Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Wed, 10 Aug 2011 17:59:55 -0700 Subject: [PATCH] Backout changeset aac29f0bdd10 (bug 676413) for causing content/html/content/test/test_bug664299.html failures. --- .../test_webgl_crossorigin_textures.html | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html b/content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html index e72a93e88209..d5149dd36a03 100644 --- a/content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html +++ b/content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html @@ -35,14 +35,8 @@ function testTexture(url, crossOriginAttribute, expected_result) { number_of_tests_live++; var image = new Image(); - if (crossOriginAttribute == "just-crossOrigin-without-value") { - var div = document.createElement('div'); - div.innerHTML=""; - image = div.children[0]; - } - else if (crossOriginAttribute != "missing-value-default") + if (crossOriginAttribute != "missing-value-default") image.crossOrigin = crossOriginAttribute; - function testDone() { number_of_tests_live--; @@ -83,25 +77,20 @@ return; } + testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png", + "missing-value-default", + OK); - testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png", - "missing-value-default", - OK); testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png", "", OK); - testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png", - "just-crossOrigin-without-value", - OK); + testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png", "missing-value-default", SECURITY_ERR); testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png", "", SECURITY_ERR); - testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png", - "just-crossOrigin-without-value", - SECURITY_ERR); testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png", "missing-value-default", @@ -109,9 +98,6 @@ testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png", "", OK); - testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png", - "just-crossOrigin-without-value", - OK); testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png", "anonymous", OK); @@ -125,9 +111,6 @@ testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png", "", OK); - testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png", - "just-crossOrigin-without-value", - OK); testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png", "anonymous", OK);