Merge 88489 - 2011-06-09 Kenneth Russell <kbr@google.com>

LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt

Index: LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt
===================================================================
--- LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt	(revision 88897)
+++ LayoutTests/http/tests/canvas/webgl/origin-clean-conformance-expected.txt	(working copy)
@@ -1,31 +1,29 @@
-This test ensures WebGL implementations follow proper origin restrictions.
+This test ensures WebGL implementations follow proper same-origin restrictions.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 PASS Playable video format found
 PASS img was loaded
 
-check that copying an img from another origin clears the origin-clean flag.
-PASS should not throw exception by readPixels for origin clean canvas.
-PASS should not throw exception by toDataURL for origin clean canvas.
-PASS should throw exception by readPixels for NON origin clean canvas.
+check that an attempt to upload an image from another origin throws an exception.
+PASS texImage2D with cross-origin image should throw exception.
+PASS texSubImage2D with cross-origin image should throw exception.
+check that readPixels and toDataURL continue to work against this canvas.
+PASS readPixels should never throw exception -- not possible to dirty origin of WebGL canvas.
+PASS should not throw exception by toDataURL for WebGL canvas, which should stay origin clean.
+check that an attempt to upload a tainted canvas throws an exception.
 PASS should throw exception by toDataURL for NON origin clean canvas.
+PASS texImage2D with NON origin clean canvas should throw exception.
+PASS texSubImage2D with NON origin clean canvas should throw exception.
+check that readPixels and toDataURL continue to work against this canvas.
+PASS readPixels should never throw exception -- not possible to dirty origin of WebGL canvas.
+PASS should not throw exception by toDataURL for WebGL canvas, which should stay origin clean.
+check that an attempt to upload a video from another origin throws an exception.
+PASS texImage2D with cross-origin video should throw exception.
+PASS texSubImage2D with cross-origin video should throw exception.
+check that readPixels and toDataURL continue to work against this canvas.
+PASS readPixels should never throw exception -- not possible to dirty origin of WebGL canvas.
+PASS should not throw exception by toDataURL for WebGL canvas, which should stay origin clean.
 
-check that copying from 1 unclean 3d canvas to another clears the origin-clean flag on the second canvas.
-PASS should not throw exception by readPixels for origin clean canvas.
-PASS should not throw exception by toDataURL for origin clean canvas.
-PASS should throw exception by readPixels for NON origin clean canvas.
-PASS should throw exception by toDataURL for NON origin clean canvas.
-
-check that copying from 1 unclean 3d canvas to a 2d canvas clears the origin-clean flag on the 2d canvas.
-PASS should not throw exception by toDataURL for origin clean canvas.
-PASS should throw exception by toDataURL for NON origin clean canvas.
-
-check that copying a video from another origin clears the origin-clean flag.
-PASS should not throw exception by readPixels for origin clean canvas.
-PASS should not throw exception by toDataURL for origin clean canvas.
-PASS should throw exception by readPixels for NON origin clean canvas.
-PASS should throw exception by toDataURL for NON origin clean canvas.
-
 TEST COMPLETE
-   
+