WebKit Bugzilla
New
Browse
Search+
Log In
×
Sign in with GitHub
or
Remember my login
Create Account
·
Forgot Password
Forgotten password account recovery
[patch]
WIP - move webgl folder
webgl_moving.diff (text/plain), 209.63 KB, created by
Roland Takacs
on 2013-01-29 07:08:33 PST
(
hide
)
Description:
WIP - move webgl folder
Filename:
MIME Type:
Creator:
Roland Takacs
Created:
2013-01-29 07:08:33 PST
Size:
209.63 KB
patch
obsolete
>diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/blackberry/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/blackberry/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-expected.txt b/LayoutTests/platform/blackberry/webgl/css-webkit-canvas-expected.txt >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-expected.txt >rename to LayoutTests/platform/blackberry/webgl/css-webkit-canvas-expected.txt >diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/blackberry/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/blackberry/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt b/LayoutTests/platform/blackberry/webgl/css-webkit-canvas-repaint-expected.txt >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt >rename to LayoutTests/platform/blackberry/webgl/css-webkit-canvas-repaint-expected.txt >diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt b/LayoutTests/platform/blackberry/webgl/draw-elements-out-of-bounds-expected.txt >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt >rename to LayoutTests/platform/blackberry/webgl/draw-elements-out-of-bounds-expected.txt >diff --git a/LayoutTests/platform/blackberry/fast/canvas/webgl/framebuffer-object-attachment-expected.txt b/LayoutTests/platform/blackberry/webgl/framebuffer-object-attachment-expected.txt >similarity index 100% >rename from LayoutTests/platform/blackberry/fast/canvas/webgl/framebuffer-object-attachment-expected.txt >rename to LayoutTests/platform/blackberry/webgl/framebuffer-object-attachment-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium-linux-x86/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium-linux-x86/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium-linux-x86/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium-linux/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-linux-x86/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium-linux/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium-linux/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/chromium-linux/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium-linux/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/chromium-linux/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/chromium-linux/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/chromium-linux/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium-linux/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/chromium-linux/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/chromium-linux/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium-mac/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-linux/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium-mac/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/read-pixels-test-expected.txt b/LayoutTests/platform/chromium-mac/webgl/read-pixels-test-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-mac/fast/canvas/webgl/read-pixels-test-expected.txt >rename to LayoutTests/platform/chromium-mac/webgl/read-pixels-test-expected.txt >diff --git a/LayoutTests/platform/chromium-mac/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium-win-xp/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-mac/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium-win-xp/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium-win-xp/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium-win/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-win-xp/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium-win/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium-win/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/chromium-win/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium-win/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/chromium-win/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/chromium-win/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/chromium-win/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium-win/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/chromium-win/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/chromium-win/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/platform/chromium/platform/chromium/virtual/gpu/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium-win/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/platform/chromium/platform/chromium/virtual/gpu/webgl/context-lost-expected.txt >diff --git a/LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/chromium/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/chromium/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-expected.txt b/LayoutTests/platform/chromium/webgl/css-webkit-canvas-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-expected.txt >rename to LayoutTests/platform/chromium/webgl/css-webkit-canvas-expected.txt >diff --git a/LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/chromium/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/chromium/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt b/LayoutTests/platform/chromium/webgl/css-webkit-canvas-repaint-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt >rename to LayoutTests/platform/chromium/webgl/css-webkit-canvas-repaint-expected.txt >diff --git a/LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/efl/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/efl/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-expected.txt b/LayoutTests/platform/efl/webgl/css-webkit-canvas-expected.txt >similarity index 100% >rename from LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-expected.txt >rename to LayoutTests/platform/efl/webgl/css-webkit-canvas-expected.txt >diff --git a/LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/efl/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/efl/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt b/LayoutTests/platform/efl/webgl/css-webkit-canvas-repaint-expected.txt >similarity index 100% >rename from LayoutTests/platform/efl/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt >rename to LayoutTests/platform/efl/webgl/css-webkit-canvas-repaint-expected.txt >diff --git a/LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-expected.png b/LayoutTests/platform/mac/webgl/css-webkit-canvas-expected.png >similarity index 100% >rename from LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-expected.png >rename to LayoutTests/platform/mac/webgl/css-webkit-canvas-expected.png >diff --git a/LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-expected.txt b/LayoutTests/platform/mac/webgl/css-webkit-canvas-expected.txt >similarity index 100% >rename from LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-expected.txt >rename to LayoutTests/platform/mac/webgl/css-webkit-canvas-expected.txt >diff --git a/LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png b/LayoutTests/platform/mac/webgl/css-webkit-canvas-repaint-expected.png >similarity index 100% >rename from LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-repaint-expected.png >rename to LayoutTests/platform/mac/webgl/css-webkit-canvas-repaint-expected.png >diff --git a/LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt b/LayoutTests/platform/mac/webgl/css-webkit-canvas-repaint-expected.txt >similarity index 100% >rename from LayoutTests/platform/mac/fast/canvas/webgl/css-webkit-canvas-repaint-expected.txt >rename to LayoutTests/platform/mac/webgl/css-webkit-canvas-repaint-expected.txt >diff --git a/LayoutTests/platform/mac/fast/canvas/webgl/oes-element-index-uint-expected.txt b/LayoutTests/platform/mac/webgl/oes-element-index-uint-expected.txt >similarity index 100% >rename from LayoutTests/platform/mac/fast/canvas/webgl/oes-element-index-uint-expected.txt >rename to LayoutTests/platform/mac/webgl/oes-element-index-uint-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/WebGLContextEvent-expected.txt b/LayoutTests/webgl/WebGLContextEvent-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/WebGLContextEvent-expected.txt >rename to LayoutTests/webgl/WebGLContextEvent-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/WebGLContextEvent.html b/LayoutTests/webgl/WebGLContextEvent.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/WebGLContextEvent.html >rename to LayoutTests/webgl/WebGLContextEvent.html >index 6c3088b..476faa0 100644 >--- a/LayoutTests/fast/canvas/webgl/WebGLContextEvent.html >+++ b/LayoutTests/webgl/WebGLContextEvent.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script> >@@ -72,7 +72,7 @@ function finish() { > if (window.nonKhronosFrameworkNotifyDone) > window.nonKhronosFrameworkNotifyDone(); > }; >- epilogue.src = "../../js/resources/js-test-post.js"; >+ epilogue.src = "../fast/js/resources/js-test-post.js"; > document.body.appendChild(epilogue); > } > >diff --git a/LayoutTests/fast/canvas/webgl/array-bounds-clamping-expected.txt b/LayoutTests/webgl/array-bounds-clamping-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-bounds-clamping-expected.txt >rename to LayoutTests/webgl/array-bounds-clamping-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html b/LayoutTests/webgl/array-bounds-clamping.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/array-bounds-clamping.html >rename to LayoutTests/webgl/array-bounds-clamping.html >index a90dee7..b522f97 100644 >--- a/LayoutTests/fast/canvas/webgl/array-bounds-clamping.html >+++ b/LayoutTests/webgl/array-bounds-clamping.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL array bounds clamping conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > </head> > <body> >@@ -100,7 +100,7 @@ function init() > > init(); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-crash-expected.txt b/LayoutTests/webgl/array-buffer-crash-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-buffer-crash-expected.txt >rename to LayoutTests/webgl/array-buffer-crash-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-crash.html b/LayoutTests/webgl/array-buffer-crash.html >similarity index 75% >rename from LayoutTests/fast/canvas/webgl/array-buffer-crash.html >rename to LayoutTests/webgl/array-buffer-crash.html >index 7bdfb85..339c710 100644 >--- a/LayoutTests/fast/canvas/webgl/array-buffer-crash.html >+++ b/LayoutTests/webgl/array-buffer-crash.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -17,7 +17,7 @@ new ArrayBuffer().byteLength; > testPassed("new ArrayBuffer().byteLength did not crash"); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-expected.txt b/LayoutTests/webgl/array-buffer-view-crash-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-buffer-view-crash-expected.txt >rename to LayoutTests/webgl/array-buffer-view-crash-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned-expected.txt b/LayoutTests/webgl/array-buffer-view-crash-when-reassigned-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned-expected.txt >rename to LayoutTests/webgl/array-buffer-view-crash-when-reassigned-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html b/LayoutTests/webgl/array-buffer-view-crash-when-reassigned.html >similarity index 83% >rename from LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html >rename to LayoutTests/webgl/array-buffer-view-crash-when-reassigned.html >index 84fb8c8..80c1803 100644 >--- a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash-when-reassigned.html >+++ b/LayoutTests/webgl/array-buffer-view-crash-when-reassigned.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -23,7 +23,7 @@ new Int16Array(function() {}); > testPassed("reassigning typed array constructor did not crash"); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html b/LayoutTests/webgl/array-buffer-view-crash.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html >rename to LayoutTests/webgl/array-buffer-view-crash.html >index c0690a2..8fdc05a 100644 >--- a/LayoutTests/fast/canvas/webgl/array-buffer-view-crash.html >+++ b/LayoutTests/webgl/array-buffer-view-crash.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -17,7 +17,7 @@ new Uint32Array().length; > testPassed("new Uint32Array().length did not crash"); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/array-constructor-expected.txt b/LayoutTests/webgl/array-constructor-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-constructor-expected.txt >rename to LayoutTests/webgl/array-constructor-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-constructor.html b/LayoutTests/webgl/array-constructor.html >similarity index 85% >rename from LayoutTests/fast/canvas/webgl/array-constructor.html >rename to LayoutTests/webgl/array-constructor.html >index f379e64..c7ce6ab 100644 >--- a/LayoutTests/fast/canvas/webgl/array-constructor.html >+++ b/LayoutTests/webgl/array-constructor.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -30,7 +30,7 @@ for (idx = 0; idx < target.length; idx++) { > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal-expected.txt b/LayoutTests/webgl/array-get-and-set-method-removal-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal-expected.txt >rename to LayoutTests/webgl/array-get-and-set-method-removal-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.html b/LayoutTests/webgl/array-get-and-set-method-removal.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.html >rename to LayoutTests/webgl/array-get-and-set-method-removal.html >index 7a37ee2..d7ef8e9 100644 >--- a/LayoutTests/fast/canvas/webgl/array-get-and-set-method-removal.html >+++ b/LayoutTests/webgl/array-get-and-set-method-removal.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -47,6 +47,6 @@ negativeTestGetAndSetMethods("Float32Array"); > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds-expected.txt b/LayoutTests/webgl/array-get-out-of-bounds-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-get-out-of-bounds-expected.txt >rename to LayoutTests/webgl/array-get-out-of-bounds-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.html b/LayoutTests/webgl/array-get-out-of-bounds.html >similarity index 89% >rename from LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.html >rename to LayoutTests/webgl/array-get-out-of-bounds.html >index 0cc3a27..2992164 100644 >--- a/LayoutTests/fast/canvas/webgl/array-get-out-of-bounds.html >+++ b/LayoutTests/webgl/array-get-out-of-bounds.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -34,6 +34,6 @@ testGetWithOutOfRangeIndices("Float32Array"); > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-message-passing-expected.txt b/LayoutTests/webgl/array-message-passing-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-message-passing-expected.txt >rename to LayoutTests/webgl/array-message-passing-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-message-passing.html b/LayoutTests/webgl/array-message-passing.html >similarity index 55% >rename from LayoutTests/fast/canvas/webgl/array-message-passing.html >rename to LayoutTests/webgl/array-message-passing.html >index c2d80c1..facada3 100644 >--- a/LayoutTests/fast/canvas/webgl/array-message-passing.html >+++ b/LayoutTests/webgl/array-message-passing.html >@@ -1,13 +1,13 @@ > <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >-<script src="webgl-test.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> >+<script src="resources/webgl-test.js"></script> > </head> > <body> > <div id="description"></div> > <div id="console"></div> > <script src="script-tests/array-message-passing.js"></script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-override-set-expected.txt b/LayoutTests/webgl/array-override-set-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-override-set-expected.txt >rename to LayoutTests/webgl/array-override-set-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-override-set.html b/LayoutTests/webgl/array-override-set.html >similarity index 91% >rename from LayoutTests/fast/canvas/webgl/array-override-set.html >rename to LayoutTests/webgl/array-override-set.html >index 799bfdc..613b416 100644 >--- a/LayoutTests/fast/canvas/webgl/array-override-set.html >+++ b/LayoutTests/webgl/array-override-set.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -42,6 +42,6 @@ for (var i = 0; i < typeNames.length; i++) { > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments-expected.txt b/LayoutTests/webgl/array-set-invalid-arguments-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-set-invalid-arguments-expected.txt >rename to LayoutTests/webgl/array-set-invalid-arguments-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.html b/LayoutTests/webgl/array-set-invalid-arguments.html >similarity index 87% >rename from LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.html >rename to LayoutTests/webgl/array-set-invalid-arguments.html >index 1ee4e20..bed2c74 100644 >--- a/LayoutTests/fast/canvas/webgl/array-set-invalid-arguments.html >+++ b/LayoutTests/webgl/array-set-invalid-arguments.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -35,7 +35,7 @@ negativeTestSet("Float32Array"); > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds-expected.txt b/LayoutTests/webgl/array-set-out-of-bounds-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-set-out-of-bounds-expected.txt >rename to LayoutTests/webgl/array-set-out-of-bounds-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.html b/LayoutTests/webgl/array-set-out-of-bounds.html >similarity index 89% >rename from LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.html >rename to LayoutTests/webgl/array-set-out-of-bounds.html >index 2bc6f3a..9db5210 100644 >--- a/LayoutTests/fast/canvas/webgl/array-set-out-of-bounds.html >+++ b/LayoutTests/webgl/array-set-out-of-bounds.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -34,6 +34,6 @@ negativeTestSet("Float32Array"); > > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-set-with-offset-expected.txt b/LayoutTests/webgl/array-set-with-offset-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-set-with-offset-expected.txt >rename to LayoutTests/webgl/array-set-with-offset-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-set-with-offset.html b/LayoutTests/webgl/array-set-with-offset.html >similarity index 91% >rename from LayoutTests/fast/canvas/webgl/array-set-with-offset.html >rename to LayoutTests/webgl/array-set-with-offset.html >index ae92d96..e24a714 100644 >--- a/LayoutTests/fast/canvas/webgl/array-set-with-offset.html >+++ b/LayoutTests/webgl/array-set-with-offset.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -40,6 +40,6 @@ testSetters("Uint32Array", 0, 4294967295); > testSetters("Float32Array", -2.5, 3.5); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-setters-expected.txt b/LayoutTests/webgl/array-setters-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-setters-expected.txt >rename to LayoutTests/webgl/array-setters-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-setters.html b/LayoutTests/webgl/array-setters.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/array-setters.html >rename to LayoutTests/webgl/array-setters.html >index 301a184..d4875cd 100644 >--- a/LayoutTests/fast/canvas/webgl/array-setters.html >+++ b/LayoutTests/webgl/array-setters.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -66,6 +66,6 @@ testSetters("Uint32Array", 0, 4294967295); > testSetters("Float32Array", -2.5, 3.5); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt b/LayoutTests/webgl/array-unit-tests-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/array-unit-tests-expected.txt >rename to LayoutTests/webgl/array-unit-tests-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/array-unit-tests.html b/LayoutTests/webgl/array-unit-tests.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/array-unit-tests.html >rename to LayoutTests/webgl/array-unit-tests.html >index e9b3017..451430d 100644 >--- a/LayoutTests/fast/canvas/webgl/array-unit-tests.html >+++ b/LayoutTests/webgl/array-unit-tests.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -1104,7 +1104,7 @@ function runTests() { > runTests(); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control-expected.txt b/LayoutTests/webgl/arraybuffer-transfer-of-control-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control-expected.txt >rename to LayoutTests/webgl/arraybuffer-transfer-of-control-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html b/LayoutTests/webgl/arraybuffer-transfer-of-control.html >similarity index 47% >rename from LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html >rename to LayoutTests/webgl/arraybuffer-transfer-of-control.html >index 465f561..2dd2b1f 100644 >--- a/LayoutTests/fast/canvas/webgl/arraybuffer-transfer-of-control.html >+++ b/LayoutTests/webgl/arraybuffer-transfer-of-control.html >@@ -1,15 +1,15 @@ > <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> > <html> > <head> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >-<script src="webgl-test.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> >+<script src="resources/webgl-test.js"></script> > </head> > <body> > <div id="description"></div> > <div id="console"></div> > <script src="script-tests/arraybuffer-transfer-of-control.js"></script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/attrib-location-length-limits-expected.txt b/LayoutTests/webgl/attrib-location-length-limits-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/attrib-location-length-limits-expected.txt >rename to LayoutTests/webgl/attrib-location-length-limits-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html b/LayoutTests/webgl/attrib-location-length-limits.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html >rename to LayoutTests/webgl/attrib-location-length-limits.html >index f8e1a7c..a4ac467 100644 >--- a/LayoutTests/fast/canvas/webgl/attrib-location-length-limits.html >+++ b/LayoutTests/webgl/attrib-location-length-limits.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL attrib location length tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -94,6 +94,6 @@ shouldBe('gl.getAttribLocation(program, "vPosition012345678901234567890123456789 > wtu.glErrorShouldBe(gl, gl.INVALID_VALUE); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/bad-arguments-test-expected.txt b/LayoutTests/webgl/bad-arguments-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/bad-arguments-test-expected.txt >rename to LayoutTests/webgl/bad-arguments-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/bad-arguments-test.html b/LayoutTests/webgl/bad-arguments-test.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/bad-arguments-test.html >rename to LayoutTests/webgl/bad-arguments-test.html >index 27e95d4..2e62a13 100644 >--- a/LayoutTests/fast/canvas/webgl/bad-arguments-test.html >+++ b/LayoutTests/webgl/bad-arguments-test.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -86,6 +86,6 @@ for (var i = 0; i < arguments.length; ++i) { > } > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/buffer-bind-test-expected.txt b/LayoutTests/webgl/buffer-bind-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/buffer-bind-test-expected.txt >rename to LayoutTests/webgl/buffer-bind-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/buffer-bind-test.html b/LayoutTests/webgl/buffer-bind-test.html >similarity index 93% >rename from LayoutTests/fast/canvas/webgl/buffer-bind-test.html >rename to LayoutTests/webgl/buffer-bind-test.html >index 3e62967..d82bade 100644 >--- a/LayoutTests/fast/canvas/webgl/buffer-bind-test.html >+++ b/LayoutTests/webgl/buffer-bind-test.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL BindBuffer conformance test.</title> >- <script src="../../js/resources/js-test-pre.js"></script> >+ <script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > </head> > <body> >@@ -53,7 +53,7 @@ if (!gl) { > debug(""); > </script> > </body> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer-expected.txt b/LayoutTests/webgl/buffer-data-array-buffer-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/buffer-data-array-buffer-expected.txt >rename to LayoutTests/webgl/buffer-data-array-buffer-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html b/LayoutTests/webgl/buffer-data-array-buffer.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html >rename to LayoutTests/webgl/buffer-data-array-buffer.html >index 344e7fc..dba746b 100644 >--- a/LayoutTests/fast/canvas/webgl/buffer-data-array-buffer.html >+++ b/LayoutTests/webgl/buffer-data-array-buffer.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -55,6 +55,6 @@ gl.bufferSubData(gl.ARRAY_BUFFER, 10, null); > glErrorShouldBe(gl, gl.NO_ERROR); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture-expected.txt b/LayoutTests/webgl/canvas-2d-webgl-texture-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture-expected.txt >rename to LayoutTests/webgl/canvas-2d-webgl-texture-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html b/LayoutTests/webgl/canvas-2d-webgl-texture.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html >rename to LayoutTests/webgl/canvas-2d-webgl-texture.html >index 962232c..f77a8cb 100755 >--- a/LayoutTests/fast/canvas/webgl/canvas-2d-webgl-texture.html >+++ b/LayoutTests/webgl/canvas-2d-webgl-texture.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -69,7 +69,7 @@ window.onload = function() > setTimeout(draw, 0); > } > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > <body> > <div id="description"></div> > <div id="console"></div> >diff --git a/LayoutTests/fast/canvas/webgl/canvas-test-expected.txt b/LayoutTests/webgl/canvas-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/canvas-test-expected.txt >rename to LayoutTests/webgl/canvas-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/canvas-test.html b/LayoutTests/webgl/canvas-test.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/canvas-test.html >rename to LayoutTests/webgl/canvas-test.html >index 0ef144c..1bf0ed3 100644 >--- a/LayoutTests/fast/canvas/webgl/canvas-test.html >+++ b/LayoutTests/webgl/canvas-test.html >@@ -5,7 +5,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL Canvas Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -175,7 +175,7 @@ if (!gl) { > debug(""); > var epilogue = document.createElement("script"); > epilogue.onload = finish; >- epilogue.src = "../../js/resources/js-test-post.js"; >+ epilogue.src = "../fast/js/resources/js-test-post.js"; > document.body.appendChild(epilogue); > } > }, 1000/30); >diff --git a/LayoutTests/fast/canvas/webgl/canvas-zero-size-expected.txt b/LayoutTests/webgl/canvas-zero-size-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/canvas-zero-size-expected.txt >rename to LayoutTests/webgl/canvas-zero-size-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/canvas-zero-size.html b/LayoutTests/webgl/canvas-zero-size.html >similarity index 87% >rename from LayoutTests/fast/canvas/webgl/canvas-zero-size.html >rename to LayoutTests/webgl/canvas-zero-size.html >index 098ba82..dbfde33 100644 >--- a/LayoutTests/fast/canvas/webgl/canvas-zero-size.html >+++ b/LayoutTests/webgl/canvas-zero-size.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>Zero Size Canvas Test</title> >- <script src="../../js/resources/js-test-pre.js"></script> >+ <script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -29,7 +29,7 @@ wtu.drawQuad(gl); > > glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors from setup."); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/compressed-tex-image-expected.txt b/LayoutTests/webgl/compressed-tex-image-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/compressed-tex-image-expected.txt >rename to LayoutTests/webgl/compressed-tex-image-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/compressed-tex-image.html b/LayoutTests/webgl/compressed-tex-image.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/compressed-tex-image.html >rename to LayoutTests/webgl/compressed-tex-image.html >index ab1950d..a3aac07 100644 >--- a/LayoutTests/fast/canvas/webgl/compressed-tex-image.html >+++ b/LayoutTests/webgl/compressed-tex-image.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL CompressedTexImage and CompressedTexSubImage Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -45,7 +45,7 @@ if (!gl) { > shouldGenerateGLError(gl, gl.INVALID_ENUM, "gl.compressedTexImage2D(gl.TEXTURE_2D, 0, COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, 8, 8, 0, new Uint8Array(8))"); > } > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/constants-expected.txt b/LayoutTests/webgl/constants-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/constants-expected.txt >rename to LayoutTests/webgl/constants-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/constants.html b/LayoutTests/webgl/constants.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/constants.html >rename to LayoutTests/webgl/constants.html >index 75c0903..d90d506 100644 >--- a/LayoutTests/fast/canvas/webgl/constants.html >+++ b/LayoutTests/webgl/constants.html >@@ -8,7 +8,7 @@ found in the LICENSE file. > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL Constants Test</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -507,7 +507,7 @@ for (var i in gl) { > > debug(""); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt b/LayoutTests/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt >rename to LayoutTests/webgl/context-attributes-alpha-depth-stencil-antialias-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html b/LayoutTests/webgl/context-attributes-alpha-depth-stencil-antialias.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html >rename to LayoutTests/webgl/context-attributes-alpha-depth-stencil-antialias.html >index 262c2c2..8ed494c 100644 >--- a/LayoutTests/fast/canvas/webgl/context-attributes-alpha-depth-stencil-antialias.html >+++ b/LayoutTests/webgl/context-attributes-alpha-depth-stencil-antialias.html >@@ -3,8 +3,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script id="vshader" type="x-shader/x-vertex"> > attribute vec3 pos; >diff --git a/LayoutTests/fast/canvas/webgl/context-creation-and-destruction-expected.txt b/LayoutTests/webgl/context-creation-and-destruction-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-creation-and-destruction-expected.txt >rename to LayoutTests/webgl/context-creation-and-destruction-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html b/LayoutTests/webgl/context-creation-and-destruction.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html >rename to LayoutTests/webgl/context-creation-and-destruction.html >index 0d1fcbe..63bfa5f 100644 >--- a/LayoutTests/fast/canvas/webgl/context-creation-and-destruction.html >+++ b/LayoutTests/webgl/context-creation-and-destruction.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/context-destroyed-crash-expected.txt b/LayoutTests/webgl/context-destroyed-crash-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-destroyed-crash-expected.txt >rename to LayoutTests/webgl/context-destroyed-crash-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-destroyed-crash.html b/LayoutTests/webgl/context-destroyed-crash.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-destroyed-crash.html >rename to LayoutTests/webgl/context-destroyed-crash.html >diff --git a/LayoutTests/platform/chromium/platform/chromium/virtual/gpu/fast/canvas/webgl/context-lost-expected.txt b/LayoutTests/webgl/context-lost-expected.txt >similarity index 100% >rename from LayoutTests/platform/chromium/platform/chromium/virtual/gpu/fast/canvas/webgl/context-lost-expected.txt >rename to LayoutTests/webgl/context-lost-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-lost-restored-expected.txt b/LayoutTests/webgl/context-lost-restored-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-lost-restored-expected.txt >rename to LayoutTests/webgl/context-lost-restored-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-lost-restored.html b/LayoutTests/webgl/context-lost-restored.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/context-lost-restored.html >rename to LayoutTests/webgl/context-lost-restored.html >index a15cc12..3b9f7b1 100644 >--- a/LayoutTests/fast/canvas/webgl/context-lost-restored.html >+++ b/LayoutTests/webgl/context-lost-restored.html >@@ -1,8 +1,8 @@ > <!DOCTYPE html> > <html> > <head> >-<link rel="stylesheet" href="../../resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script> >diff --git a/LayoutTests/fast/canvas/webgl/context-lost.html b/LayoutTests/webgl/context-lost.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/context-lost.html >rename to LayoutTests/webgl/context-lost.html >index 9e2f061..3347aba 100644 >--- a/LayoutTests/fast/canvas/webgl/context-lost.html >+++ b/LayoutTests/webgl/context-lost.html >@@ -1,8 +1,8 @@ > <!DOCTYPE html> > <html> > <head> >-<link rel="stylesheet" href="../../resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script> >diff --git a/LayoutTests/fast/canvas/webgl/context-release-upon-reload-expected.txt b/LayoutTests/webgl/context-release-upon-reload-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/context-release-upon-reload-expected.txt >rename to LayoutTests/webgl/context-release-upon-reload-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html b/LayoutTests/webgl/context-release-upon-reload.html >similarity index 93% >rename from LayoutTests/fast/canvas/webgl/context-release-upon-reload.html >rename to LayoutTests/webgl/context-release-upon-reload.html >index 63ae0f7..8f97ca6 100644 >--- a/LayoutTests/fast/canvas/webgl/context-release-upon-reload.html >+++ b/LayoutTests/webgl/context-release-upon-reload.html >@@ -3,8 +3,8 @@ > <head> > <meta charset="utf-8"> > <title>WebGL Context Release Test</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >diff --git a/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d-expected.txt b/LayoutTests/webgl/copy-tex-image-and-sub-image-2d-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d-expected.txt >rename to LayoutTests/webgl/copy-tex-image-and-sub-image-2d-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html b/LayoutTests/webgl/copy-tex-image-and-sub-image-2d.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html >rename to LayoutTests/webgl/copy-tex-image-and-sub-image-2d.html >index 994de78..dac5b11 100644 >--- a/LayoutTests/fast/canvas/webgl/copy-tex-image-and-sub-image-2d.html >+++ b/LayoutTests/webgl/copy-tex-image-and-sub-image-2d.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script id="vshader" type="x-shader/x-vertex"> > attribute vec3 g_Position; >@@ -166,7 +166,7 @@ function runTest(antialias) > runTestIteration(false); > var epilogue = document.createElement("script"); > epilogue.onload = finish; >- epilogue.src = "../../js/resources/js-test-post.js"; >+ epilogue.src = "../fast/js/resources/js-test-post.js"; > document.body.appendChild(epilogue); > } > >diff --git a/LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html b/LayoutTests/webgl/css-webkit-canvas-repaint.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/css-webkit-canvas-repaint.html >rename to LayoutTests/webgl/css-webkit-canvas-repaint.html >diff --git a/LayoutTests/fast/canvas/webgl/css-webkit-canvas.html b/LayoutTests/webgl/css-webkit-canvas.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/css-webkit-canvas.html >rename to LayoutTests/webgl/css-webkit-canvas.html >diff --git a/LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt b/LayoutTests/webgl/data-view-crash-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/data-view-crash-expected.txt >rename to LayoutTests/webgl/data-view-crash-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/data-view-crash.html b/LayoutTests/webgl/data-view-crash.html >similarity index 78% >rename from LayoutTests/fast/canvas/webgl/data-view-crash.html >rename to LayoutTests/webgl/data-view-crash.html >index 6fce7bc..d0b6b39 100644 >--- a/LayoutTests/fast/canvas/webgl/data-view-crash.html >+++ b/LayoutTests/webgl/data-view-crash.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > </head> > <body> > <div id="description"></div> >@@ -16,6 +16,6 @@ shouldThrow("view = new DataView(array.buffer, -4500000000, 4500000000)"); > var value = view ? view.getFloat32(0, true) : 0; > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/data-view-test-expected.txt b/LayoutTests/webgl/data-view-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/data-view-test-expected.txt >rename to LayoutTests/webgl/data-view-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/data-view-test.html b/LayoutTests/webgl/data-view-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/data-view-test.html >rename to LayoutTests/webgl/data-view-test.html >index 56940df..e310643 100644 >--- a/LayoutTests/fast/canvas/webgl/data-view-test.html >+++ b/LayoutTests/webgl/data-view-test.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > </head> > <body> > <div id="description"></div> >@@ -350,6 +350,6 @@ runSetTests(); > runIndexingTests(); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds-expected.txt b/LayoutTests/webgl/draw-arrays-out-of-bounds-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds-expected.txt >rename to LayoutTests/webgl/draw-arrays-out-of-bounds-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.html b/LayoutTests/webgl/draw-arrays-out-of-bounds.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.html >rename to LayoutTests/webgl/draw-arrays-out-of-bounds.html >index 955e56f..406c24a 100644 >--- a/LayoutTests/fast/canvas/webgl/draw-arrays-out-of-bounds.html >+++ b/LayoutTests/webgl/draw-arrays-out-of-bounds.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -103,6 +103,6 @@ shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawArrays(co > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt b/LayoutTests/webgl/draw-elements-out-of-bounds-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds-expected.txt >rename to LayoutTests/webgl/draw-elements-out-of-bounds-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html b/LayoutTests/webgl/draw-elements-out-of-bounds.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html >rename to LayoutTests/webgl/draw-elements-out-of-bounds.html >index 194d615..3f6e443 100644 >--- a/LayoutTests/fast/canvas/webgl/draw-elements-out-of-bounds.html >+++ b/LayoutTests/webgl/draw-elements-out-of-bounds.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -134,6 +134,6 @@ shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements( > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/drawingbuffer-test-expected.txt b/LayoutTests/webgl/drawingbuffer-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/drawingbuffer-test-expected.txt >rename to LayoutTests/webgl/drawingbuffer-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/drawingbuffer-test.html b/LayoutTests/webgl/drawingbuffer-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/drawingbuffer-test.html >rename to LayoutTests/webgl/drawingbuffer-test.html >index 749f810..6414deb 100644 >--- a/LayoutTests/fast/canvas/webgl/drawingbuffer-test.html >+++ b/LayoutTests/webgl/drawingbuffer-test.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL Canvas Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -215,6 +215,6 @@ test(maxSize[0] + 32, 8); > > debug("") > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/error-reporting-expected.txt b/LayoutTests/webgl/error-reporting-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/error-reporting-expected.txt >rename to LayoutTests/webgl/error-reporting-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/error-reporting.html b/LayoutTests/webgl/error-reporting.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/error-reporting.html >rename to LayoutTests/webgl/error-reporting.html >index 6b02a41..f0b3d37 100644 >--- a/LayoutTests/fast/canvas/webgl/error-reporting.html >+++ b/LayoutTests/webgl/error-reporting.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -64,6 +64,6 @@ glErrorShouldBe(context, context.INVALID_OPERATION); > glErrorShouldBe(context, context.NO_ERROR); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize-expected.txt b/LayoutTests/webgl/framebuffer-bindings-unaffected-on-resize-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize-expected.txt >rename to LayoutTests/webgl/framebuffer-bindings-unaffected-on-resize-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html b/LayoutTests/webgl/framebuffer-bindings-unaffected-on-resize.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html >rename to LayoutTests/webgl/framebuffer-bindings-unaffected-on-resize.html >index 86c2ab8..125789a 100644 >--- a/LayoutTests/fast/canvas/webgl/framebuffer-bindings-unaffected-on-resize.html >+++ b/LayoutTests/webgl/framebuffer-bindings-unaffected-on-resize.html >@@ -4,8 +4,8 @@ > <head> > <meta charset="utf-8"> > <title>Verifies that GL framebuffer bindings do not change when canvas is resized</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment-expected.txt b/LayoutTests/webgl/framebuffer-object-attachment-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/framebuffer-object-attachment-expected.txt >rename to LayoutTests/webgl/framebuffer-object-attachment-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html b/LayoutTests/webgl/framebuffer-object-attachment.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html >rename to LayoutTests/webgl/framebuffer-object-attachment.html >index ca7eba7..6953f6c 100644 >--- a/LayoutTests/fast/canvas/webgl/framebuffer-object-attachment.html >+++ b/LayoutTests/webgl/framebuffer-object-attachment.html >@@ -2,7 +2,7 @@ > <html> > <head> > <meta charset="utf-8"> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -529,6 +529,6 @@ function testFramebufferIncompleteDimensions() { > successfullyParsed = true; > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-test-expected.txt b/LayoutTests/webgl/framebuffer-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/framebuffer-test-expected.txt >rename to LayoutTests/webgl/framebuffer-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/framebuffer-test.html b/LayoutTests/webgl/framebuffer-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/framebuffer-test.html >rename to LayoutTests/webgl/framebuffer-test.html >index ae7eb58..9388f11 100644 >--- a/LayoutTests/fast/canvas/webgl/framebuffer-test.html >+++ b/LayoutTests/webgl/framebuffer-test.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL Framebuffer Test</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -163,7 +163,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > <script> > </script> > >diff --git a/LayoutTests/fast/canvas/webgl/functions-returning-strings-expected.txt b/LayoutTests/webgl/functions-returning-strings-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/functions-returning-strings-expected.txt >rename to LayoutTests/webgl/functions-returning-strings-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/functions-returning-strings.html b/LayoutTests/webgl/functions-returning-strings.html >similarity index 93% >rename from LayoutTests/fast/canvas/webgl/functions-returning-strings.html >rename to LayoutTests/webgl/functions-returning-strings.html >index 739d87b..9ef50e9 100644 >--- a/LayoutTests/fast/canvas/webgl/functions-returning-strings.html >+++ b/LayoutTests/webgl/functions-returning-strings.html >@@ -3,9 +3,9 @@ > <head> > <meta charset="utf-8"> > <title>WebGL Conformance Tests</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -90,7 +90,7 @@ debug(""); > successfullyParsed = true; > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/get-active-test-expected.txt b/LayoutTests/webgl/get-active-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/get-active-test-expected.txt >rename to LayoutTests/webgl/get-active-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/get-active-test.html b/LayoutTests/webgl/get-active-test.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/get-active-test.html >rename to LayoutTests/webgl/get-active-test.html >index 4d631cd..a3abf57 100644 >--- a/LayoutTests/fast/canvas/webgl/get-active-test.html >+++ b/LayoutTests/webgl/get-active-test.html >@@ -1,7 +1,7 @@ > > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -105,6 +105,6 @@ shouldBeNull("context.getActiveAttrib(program, 0)"); > glErrorShouldBe(context, context.INVALID_VALUE); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt b/LayoutTests/webgl/gl-bind-attrib-location-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test-expected.txt >rename to LayoutTests/webgl/gl-bind-attrib-location-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html b/LayoutTests/webgl/gl-bind-attrib-location-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html >rename to LayoutTests/webgl/gl-bind-attrib-location-test.html >index 3b99c57..9021aee 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-bind-attrib-location-test.html >+++ b/LayoutTests/webgl/gl-bind-attrib-location-test.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL BindAttribLocation Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -193,7 +193,7 @@ glErrorShouldBe(gl, gl.NO_ERROR); > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/gl-enable-enum-test-expected.txt b/LayoutTests/webgl/gl-enable-enum-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-enable-enum-test-expected.txt >rename to LayoutTests/webgl/gl-enable-enum-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html b/LayoutTests/webgl/gl-enable-enum-test.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html >rename to LayoutTests/webgl/gl-enable-enum-test.html >index 56ecd0b..407725a 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-enable-enum-test.html >+++ b/LayoutTests/webgl/gl-enable-enum-test.html >@@ -5,7 +5,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL gl.ENABLE enums Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -124,7 +124,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-enum-tests-expected.txt b/LayoutTests/webgl/gl-enum-tests-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-enum-tests-expected.txt >rename to LayoutTests/webgl/gl-enum-tests-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-enum-tests.html b/LayoutTests/webgl/gl-enum-tests.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/gl-enum-tests.html >rename to LayoutTests/webgl/gl-enum-tests.html >index 25d5dc0..4177b95 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-enum-tests.html >+++ b/LayoutTests/webgl/gl-enum-tests.html >@@ -5,7 +5,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL gl enums Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -78,7 +78,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt b/LayoutTests/webgl/gl-get-calls-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-get-calls-expected.txt >rename to LayoutTests/webgl/gl-get-calls-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-get-calls.html b/LayoutTests/webgl/gl-get-calls.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/gl-get-calls.html >rename to LayoutTests/webgl/gl-get-calls.html >index a1bbf58..1775034 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-get-calls.html >+++ b/LayoutTests/webgl/gl-get-calls.html >@@ -3,7 +3,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL gl calls Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -113,7 +113,7 @@ else { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-getshadersource-expected.txt b/LayoutTests/webgl/gl-getshadersource-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-getshadersource-expected.txt >rename to LayoutTests/webgl/gl-getshadersource-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-getshadersource.html b/LayoutTests/webgl/gl-getshadersource.html >similarity index 90% >rename from LayoutTests/fast/canvas/webgl/gl-getshadersource.html >rename to LayoutTests/webgl/gl-getshadersource.html >index fa90cde..7b6c3fc 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-getshadersource.html >+++ b/LayoutTests/webgl/gl-getshadersource.html >@@ -4,7 +4,7 @@ > <head> > <meta content='text/html; charset=UTF-8' http-equiv='Content-Type'/> > <title>WebGL getShaderSource conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -27,7 +27,7 @@ glErrorShouldBe(gl, gl.NO_ERROR, "Should be no errors."); > </script> > </body> > </body> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-getstring-expected.txt b/LayoutTests/webgl/gl-getstring-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-getstring-expected.txt >rename to LayoutTests/webgl/gl-getstring-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-getstring.html b/LayoutTests/webgl/gl-getstring.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/gl-getstring.html >rename to LayoutTests/webgl/gl-getstring.html >index 8621cbc..67214d5 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-getstring.html >+++ b/LayoutTests/webgl/gl-getstring.html >@@ -5,7 +5,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL gl.getParameter Strings Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -46,7 +46,7 @@ function checkPrefix(expected, enum_val) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt b/LayoutTests/webgl/gl-object-get-calls-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-object-get-calls-expected.txt >rename to LayoutTests/webgl/gl-object-get-calls-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html b/LayoutTests/webgl/gl-object-get-calls.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/gl-object-get-calls.html >rename to LayoutTests/webgl/gl-object-get-calls.html >index a0f2af8..a2825b1 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-object-get-calls.html >+++ b/LayoutTests/webgl/gl-object-get-calls.html >@@ -2,7 +2,7 @@ > <html> > <head> > <meta charset="utf-8"> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -247,6 +247,6 @@ shouldBeNull('gl.getVertexAttrib(1, gl.VERTEX_ATTRIB_ARRAY_BUFFER_BINDING)'); > glErrorShouldBe(gl, gl.NO_ERROR); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/gl-pixelstorei-expected.txt b/LayoutTests/webgl/gl-pixelstorei-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-pixelstorei-expected.txt >rename to LayoutTests/webgl/gl-pixelstorei-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-pixelstorei.html b/LayoutTests/webgl/gl-pixelstorei.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/gl-pixelstorei.html >rename to LayoutTests/webgl/gl-pixelstorei.html >index bad2e37..ab31674 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-pixelstorei.html >+++ b/LayoutTests/webgl/gl-pixelstorei.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL pixelStorei Test</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> > </head> >@@ -113,7 +113,7 @@ function init() { > init(); > </script> > </body> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt b/LayoutTests/webgl/gl-teximage-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-teximage-expected.txt >rename to LayoutTests/webgl/gl-teximage-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-teximage.html b/LayoutTests/webgl/gl-teximage.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/gl-teximage.html >rename to LayoutTests/webgl/gl-teximage.html >index 9418270..bb02cab 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-teximage.html >+++ b/LayoutTests/webgl/gl-teximage.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL texImage2D conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/gl-uniform-arrays-expected.txt b/LayoutTests/webgl/gl-uniform-arrays-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-uniform-arrays-expected.txt >rename to LayoutTests/webgl/gl-uniform-arrays-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html b/LayoutTests/webgl/gl-uniform-arrays.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html >rename to LayoutTests/webgl/gl-uniform-arrays.html >index c5a3ac7..efca67b 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-uniform-arrays.html >+++ b/LayoutTests/webgl/gl-uniform-arrays.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL uniform array Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -295,7 +295,7 @@ for (var tt = 0; tt < typeInfos.length; ++tt) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv-expected.txt b/LayoutTests/webgl/gl-uniformmatrix4fv-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv-expected.txt >rename to LayoutTests/webgl/gl-uniformmatrix4fv-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html b/LayoutTests/webgl/gl-uniformmatrix4fv.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html >rename to LayoutTests/webgl/gl-uniformmatrix4fv.html >index 5d87773..163d5e6 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-uniformmatrix4fv.html >+++ b/LayoutTests/webgl/gl-uniformmatrix4fv.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL uniformMatrix Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -70,7 +70,7 @@ for (var ii = 2; ii <= 4; ++ii) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-expected.txt b/LayoutTests/webgl/gl-vertex-attrib-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-vertex-attrib-expected.txt >rename to LayoutTests/webgl/gl-vertex-attrib-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues-expected.txt b/LayoutTests/webgl/gl-vertex-attrib-zero-issues-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues-expected.txt >rename to LayoutTests/webgl/gl-vertex-attrib-zero-issues-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html b/LayoutTests/webgl/gl-vertex-attrib-zero-issues.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html >rename to LayoutTests/webgl/gl-vertex-attrib-zero-issues.html >index 4a5b7e7..5209443 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib-zero-issues.html >+++ b/LayoutTests/webgl/gl-vertex-attrib-zero-issues.html >@@ -2,7 +2,7 @@ > <html> > <head> > <title>WebGL Enable Vertex Attrib Zero Test</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -79,7 +79,7 @@ for (var ii = 0; ii < 5; ++ii) { > > wtu.checkCanvas(gl, [0, 0, 0, 0], "canvas should be 0, 0, 0, 0"); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html b/LayoutTests/webgl/gl-vertex-attrib.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html >rename to LayoutTests/webgl/gl-vertex-attrib.html >index ab53459..2b37f03 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-vertex-attrib.html >+++ b/LayoutTests/webgl/gl-vertex-attrib.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL vertexAttrib Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -42,7 +42,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer-expected.txt b/LayoutTests/webgl/gl-vertexattribpointer-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/gl-vertexattribpointer-expected.txt >rename to LayoutTests/webgl/gl-vertexattribpointer-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html b/LayoutTests/webgl/gl-vertexattribpointer.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html >rename to LayoutTests/webgl/gl-vertexattribpointer.html >index 8ce5254..4ce4c8b 100644 >--- a/LayoutTests/fast/canvas/webgl/gl-vertexattribpointer.html >+++ b/LayoutTests/webgl/gl-vertexattribpointer.html >@@ -5,7 +5,7 @@ > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL vertexAttribPointer Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -127,7 +127,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt b/LayoutTests/webgl/glsl-conformance-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/glsl-conformance-expected.txt >rename to LayoutTests/webgl/glsl-conformance-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/glsl-conformance.html b/LayoutTests/webgl/glsl-conformance.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/glsl-conformance.html >rename to LayoutTests/webgl/glsl-conformance.html >index 062e50f..77d4004 100644 >--- a/LayoutTests/fast/canvas/webgl/glsl-conformance.html >+++ b/LayoutTests/webgl/glsl-conformance.html >@@ -4,7 +4,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL GLSL Conformance Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -518,7 +518,7 @@ if (!gl) { > debug(""); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour-expected.txt b/LayoutTests/webgl/incorrect-context-object-behaviour-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour-expected.txt >rename to LayoutTests/webgl/incorrect-context-object-behaviour-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html b/LayoutTests/webgl/incorrect-context-object-behaviour.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html >rename to LayoutTests/webgl/incorrect-context-object-behaviour.html >index e529b69..bfe1fda 100644 >--- a/LayoutTests/fast/canvas/webgl/incorrect-context-object-behaviour.html >+++ b/LayoutTests/webgl/incorrect-context-object-behaviour.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -52,6 +52,6 @@ shouldGenerateGLError(contextA, contextA.INVALID_OPERATION, "contextA.getUniform > shouldGenerateGLError(contextA, contextA.INVALID_OPERATION, "contextA.getUniformLocation(programB, 'u_modelViewProjMatrix')"); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-copies-indices-expected.txt b/LayoutTests/webgl/index-validation-copies-indices-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/index-validation-copies-indices-expected.txt >rename to LayoutTests/webgl/index-validation-copies-indices-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-copies-indices.html b/LayoutTests/webgl/index-validation-copies-indices.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/index-validation-copies-indices.html >rename to LayoutTests/webgl/index-validation-copies-indices.html >index 6e15e20..2beda0e 100644 >--- a/LayoutTests/fast/canvas/webgl/index-validation-copies-indices.html >+++ b/LayoutTests/webgl/index-validation-copies-indices.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -41,6 +41,6 @@ shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements( > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data-expected.txt b/LayoutTests/webgl/index-validation-crash-with-buffer-sub-data-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data-expected.txt >rename to LayoutTests/webgl/index-validation-crash-with-buffer-sub-data-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html b/LayoutTests/webgl/index-validation-crash-with-buffer-sub-data.html >similarity index 83% >rename from LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html >rename to LayoutTests/webgl/index-validation-crash-with-buffer-sub-data.html >index 11405a5..95be212 100644 >--- a/LayoutTests/fast/canvas/webgl/index-validation-crash-with-buffer-sub-data.html >+++ b/LayoutTests/webgl/index-validation-crash-with-buffer-sub-data.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -20,6 +20,6 @@ gl.bufferSubData(gl.ELEMENT_ARRAY_BUFFER, 63, data); > testPassed("bufferSubData, when buffer object was initialized with null, did not crash"); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-expected.txt b/LayoutTests/webgl/index-validation-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/index-validation-expected.txt >rename to LayoutTests/webgl/index-validation-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices-expected.txt b/LayoutTests/webgl/index-validation-verifies-too-many-indices-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices-expected.txt >rename to LayoutTests/webgl/index-validation-verifies-too-many-indices-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.html b/LayoutTests/webgl/index-validation-verifies-too-many-indices.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.html >rename to LayoutTests/webgl/index-validation-verifies-too-many-indices.html >index 32e9dfe..6f669e4 100644 >--- a/LayoutTests/fast/canvas/webgl/index-validation-verifies-too-many-indices.html >+++ b/LayoutTests/webgl/index-validation-verifies-too-many-indices.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -36,6 +36,6 @@ shouldGenerateGLError(context, context.INVALID_OPERATION, "context.drawElements( > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer-expected.txt b/LayoutTests/webgl/index-validation-with-resized-buffer-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer-expected.txt >rename to LayoutTests/webgl/index-validation-with-resized-buffer-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.html b/LayoutTests/webgl/index-validation-with-resized-buffer.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.html >rename to LayoutTests/webgl/index-validation-with-resized-buffer.html >index 087914f..f1dbe60 100644 >--- a/LayoutTests/fast/canvas/webgl/index-validation-with-resized-buffer.html >+++ b/LayoutTests/webgl/index-validation-with-resized-buffer.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -92,6 +92,6 @@ glErrorShouldBe(gl, gl.NO_ERROR, "after drawing"); > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/index-validation.html b/LayoutTests/webgl/index-validation.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/index-validation.html >rename to LayoutTests/webgl/index-validation.html >index 5c96bab..36edb72 100644 >--- a/LayoutTests/fast/canvas/webgl/index-validation.html >+++ b/LayoutTests/webgl/index-validation.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -110,6 +110,6 @@ shouldBeUndefined('gl.drawElements(gl.TRIANGLES, 3, gl.UNSIGNED_SHORT, 0)'); > successfullyParsed = true; > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/instanceof-test-expected.txt b/LayoutTests/webgl/instanceof-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/instanceof-test-expected.txt >rename to LayoutTests/webgl/instanceof-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/instanceof-test.html b/LayoutTests/webgl/instanceof-test.html >similarity index 93% >rename from LayoutTests/fast/canvas/webgl/instanceof-test.html >rename to LayoutTests/webgl/instanceof-test.html >index d293235..e097945 100644 >--- a/LayoutTests/fast/canvas/webgl/instanceof-test.html >+++ b/LayoutTests/webgl/instanceof-test.html >@@ -4,8 +4,8 @@ > <head> > <meta charset="utf-8"> > <title>WebGL instanceof test.</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -81,7 +81,7 @@ shouldThrowWithNew(window.WebGLShaderPrecisionFormat, 'WebGLShaderPrecisionForma > > successfullyParsed = true; > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/invalid-UTF-16-expected.txt b/LayoutTests/webgl/invalid-UTF-16-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/invalid-UTF-16-expected.txt >rename to LayoutTests/webgl/invalid-UTF-16-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/invalid-UTF-16.html b/LayoutTests/webgl/invalid-UTF-16.html >similarity index 90% >rename from LayoutTests/fast/canvas/webgl/invalid-UTF-16.html >rename to LayoutTests/webgl/invalid-UTF-16.html >index 4700bb8..d527c81 100644 >--- a/LayoutTests/fast/canvas/webgl/invalid-UTF-16.html >+++ b/LayoutTests/webgl/invalid-UTF-16.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -33,6 +33,6 @@ var program = gl.createProgram(); > gl.bindAttribLocation(program, 0, string); > testPassed("bindAttribLocation with invalid UTF-16 did not crash"); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt b/LayoutTests/webgl/invalid-passed-params-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/invalid-passed-params-expected.txt >rename to LayoutTests/webgl/invalid-passed-params-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/invalid-passed-params.html b/LayoutTests/webgl/invalid-passed-params.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/invalid-passed-params.html >rename to LayoutTests/webgl/invalid-passed-params.html >index a050674..3f480f8 100644 >--- a/LayoutTests/fast/canvas/webgl/invalid-passed-params.html >+++ b/LayoutTests/webgl/invalid-passed-params.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/desktop-gl-constants.js"></script> > </head> >@@ -160,6 +160,6 @@ for (var i = 0; i < invalidSet.length; ++i) { > debug("") > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/is-object-expected.txt b/LayoutTests/webgl/is-object-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/is-object-expected.txt >rename to LayoutTests/webgl/is-object-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/is-object.html b/LayoutTests/webgl/is-object.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/is-object.html >rename to LayoutTests/webgl/is-object.html >index 957c486..8561cfe 100644 >--- a/LayoutTests/fast/canvas/webgl/is-object.html >+++ b/LayoutTests/webgl/is-object.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -64,6 +64,6 @@ shouldGenerateGLError(gl, gl.NO_ERROR, "gl.deleteShader(shader)"); > shouldBeFalse("gl.isShader(shader)"); > debug(""); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/null-object-behaviour-expected.txt b/LayoutTests/webgl/null-object-behaviour-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/null-object-behaviour-expected.txt >rename to LayoutTests/webgl/null-object-behaviour-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/null-object-behaviour.html b/LayoutTests/webgl/null-object-behaviour.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/null-object-behaviour.html >rename to LayoutTests/webgl/null-object-behaviour.html >index 0283855..c7832d2 100644 >--- a/LayoutTests/fast/canvas/webgl/null-object-behaviour.html >+++ b/LayoutTests/webgl/null-object-behaviour.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -75,6 +75,6 @@ shouldGenerateGLError(context, context.INVALID_OPERATION, "context.texParameteri > shouldGenerateGLError(context, context.INVALID_OPERATION, "context.getTexParameter(context.TEXTURE_2D, context.TEXTURE_MIN_FILTER)"); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/null-uniform-location-expected.txt b/LayoutTests/webgl/null-uniform-location-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/null-uniform-location-expected.txt >rename to LayoutTests/webgl/null-uniform-location-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/null-uniform-location.html b/LayoutTests/webgl/null-uniform-location.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/null-uniform-location.html >rename to LayoutTests/webgl/null-uniform-location.html >index 3cece6a..49a779a 100644 >--- a/LayoutTests/fast/canvas/webgl/null-uniform-location.html >+++ b/LayoutTests/webgl/null-uniform-location.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -61,6 +61,6 @@ for (var i = 0; i < funcs.length; i++) { > } > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/object-deletion-behaviour-expected.txt b/LayoutTests/webgl/object-deletion-behaviour-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/object-deletion-behaviour-expected.txt >rename to LayoutTests/webgl/object-deletion-behaviour-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html b/LayoutTests/webgl/object-deletion-behaviour.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html >rename to LayoutTests/webgl/object-deletion-behaviour.html >index 2f2e749..b79c67b 100644 >--- a/LayoutTests/fast/canvas/webgl/object-deletion-behaviour.html >+++ b/LayoutTests/webgl/object-deletion-behaviour.html >@@ -2,7 +2,7 @@ > <html> > <head> > <meta charset="utf-8"> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -417,6 +417,6 @@ if (gl.checkFramebufferStatus(gl.FRAMEBUFFER) == gl.FRAMEBUFFER_COMPLETE) { > successfullyParsed = true; > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/oes-element-index-uint-expected.txt b/LayoutTests/webgl/oes-element-index-uint-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/oes-element-index-uint-expected.txt >rename to LayoutTests/webgl/oes-element-index-uint-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html b/LayoutTests/webgl/oes-element-index-uint.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/oes-element-index-uint.html >rename to LayoutTests/webgl/oes-element-index-uint.html >index 7c92844..25a0279 100644 >--- a/LayoutTests/fast/canvas/webgl/oes-element-index-uint.html >+++ b/LayoutTests/webgl/oes-element-index-uint.html >@@ -4,7 +4,7 @@ > <meta charset="utf-8"> > <title>WebGL OES_element_index_uint Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -390,7 +390,7 @@ function runCrashWithBufferSubDataTests() { > testPassed("bufferSubData, when buffer object was initialized with null, did not crash"); > } > </script> >-<script src="../../resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/oes-vertex-array-object-expected.txt b/LayoutTests/webgl/oes-vertex-array-object-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/oes-vertex-array-object-expected.txt >rename to LayoutTests/webgl/oes-vertex-array-object-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html b/LayoutTests/webgl/oes-vertex-array-object.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html >rename to LayoutTests/webgl/oes-vertex-array-object.html >index cd07943..3cce291 100644 >--- a/LayoutTests/fast/canvas/webgl/oes-vertex-array-object.html >+++ b/LayoutTests/webgl/oes-vertex-array-object.html >@@ -4,7 +4,7 @@ > <meta charset="utf-8"> > <title>WebGL OES_vertex_array_object Conformance Tests</title> > <script src="resources/desktop-gl-constants.js" type="text/javascript"></script> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -591,7 +591,7 @@ function runArrayBufferBindTests() { > debug(""); > successfullyParsed = true; > </script> >-<script src="../../resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/point-size-expected.txt b/LayoutTests/webgl/point-size-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/point-size-expected.txt >rename to LayoutTests/webgl/point-size-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/point-size.html b/LayoutTests/webgl/point-size.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/point-size.html >rename to LayoutTests/webgl/point-size.html >index a177f89..95ba6c4 100644 >--- a/LayoutTests/fast/canvas/webgl/point-size.html >+++ b/LayoutTests/webgl/point-size.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script id="vshader" type="x-shader/x-vertex"> > attribute vec3 pos; >@@ -119,7 +119,7 @@ if (runTest()) > testPassed(""); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt b/LayoutTests/webgl/premultiplyalpha-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/premultiplyalpha-test-expected.txt >rename to LayoutTests/webgl/premultiplyalpha-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html b/LayoutTests/webgl/premultiplyalpha-test.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html >rename to LayoutTests/webgl/premultiplyalpha-test.html >index f8acc05..7960735 100644 >--- a/LayoutTests/fast/canvas/webgl/premultiplyalpha-test.html >+++ b/LayoutTests/webgl/premultiplyalpha-test.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>Test the WebGL premultipledAlpha context creation flag.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/program-test-expected.txt b/LayoutTests/webgl/program-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/program-test-expected.txt >rename to LayoutTests/webgl/program-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/program-test.html b/LayoutTests/webgl/program-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/program-test.html >rename to LayoutTests/webgl/program-test.html >index ea6263f..d28f971 100644 >--- a/LayoutTests/fast/canvas/webgl/program-test.html >+++ b/LayoutTests/webgl/program-test.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL Program Compiling/Linking Conformance Test</title> >-<script src="../../js/resources/js-test-pre.js" type="text/javascript"></script> >+<script src="../fast/js/resources/js-test-pre.js" type="text/javascript"></script> > <script src="resources/webgl-test.js" type="text/javascript"></script> > </head> > <body> >@@ -305,7 +305,7 @@ function go() { > debug(""); > go(); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt b/LayoutTests/webgl/read-pixels-pack-alignment-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt >rename to LayoutTests/webgl/read-pixels-pack-alignment-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html b/LayoutTests/webgl/read-pixels-pack-alignment.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html >rename to LayoutTests/webgl/read-pixels-pack-alignment.html >index abcdced..83411d9 100644 >--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html >+++ b/LayoutTests/webgl/read-pixels-pack-alignment.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script id="vshader" type="x-shader/x-vertex"> > attribute vec3 pos; >@@ -233,6 +233,6 @@ runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 2, 1, -1); > runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 4, 0, -1); > runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 8, -1, -1); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-test-expected.txt b/LayoutTests/webgl/read-pixels-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/read-pixels-test-expected.txt >rename to LayoutTests/webgl/read-pixels-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-test.html b/LayoutTests/webgl/read-pixels-test.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/read-pixels-test.html >rename to LayoutTests/webgl/read-pixels-test.html >index e6410e5..d8d6e76 100644 >--- a/LayoutTests/fast/canvas/webgl/read-pixels-test.html >+++ b/LayoutTests/webgl/read-pixels-test.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL ReadPixels conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/renderbuffer-initialization-expected.txt b/LayoutTests/webgl/renderbuffer-initialization-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/renderbuffer-initialization-expected.txt >rename to LayoutTests/webgl/renderbuffer-initialization-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html b/LayoutTests/webgl/renderbuffer-initialization.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html >rename to LayoutTests/webgl/renderbuffer-initialization.html >index 49bbe80..2d2b43c 100644 >--- a/LayoutTests/fast/canvas/webgl/renderbuffer-initialization.html >+++ b/LayoutTests/webgl/renderbuffer-initialization.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script> > function runTest(gl, width, height) >@@ -79,6 +79,6 @@ if (gl) { > } else > testFailed('canvas.getContext() failed'); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings-expected.txt b/LayoutTests/webgl/renderer-and-vendor-strings-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings-expected.txt >rename to LayoutTests/webgl/renderer-and-vendor-strings-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html b/LayoutTests/webgl/renderer-and-vendor-strings.html >similarity index 86% >rename from LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html >rename to LayoutTests/webgl/renderer-and-vendor-strings.html >index 2a7f706..d795e85 100644 >--- a/LayoutTests/fast/canvas/webgl/renderer-and-vendor-strings.html >+++ b/LayoutTests/webgl/renderer-and-vendor-strings.html >@@ -1,5 +1,5 @@ > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -24,5 +24,5 @@ shouldBe("gl.getParameter(gl.RENDERER)", '"WebKit WebGL"'); > shouldBe("gl.getParameter(gl.VENDOR)", '"WebKit"'); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> >diff --git a/LayoutTests/fast/canvas/webgl/resources/3x3.png b/LayoutTests/webgl/resources/3x3.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/3x3.png >rename to LayoutTests/webgl/resources/3x3.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/blue-1x1.jpg b/LayoutTests/webgl/resources/blue-1x1.jpg >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/blue-1x1.jpg >rename to LayoutTests/webgl/resources/blue-1x1.jpg >diff --git a/LayoutTests/fast/canvas/webgl/resources/boolUniformShader.vert b/LayoutTests/webgl/resources/boolUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/boolUniformShader.vert >rename to LayoutTests/webgl/resources/boolUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/bug-32888-texture.png b/LayoutTests/webgl/resources/bug-32888-texture.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/bug-32888-texture.png >rename to LayoutTests/webgl/resources/bug-32888-texture.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/context-release-upon-reload-child.html b/LayoutTests/webgl/resources/context-release-upon-reload-child.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/context-release-upon-reload-child.html >rename to LayoutTests/webgl/resources/context-release-upon-reload-child.html >diff --git a/LayoutTests/fast/canvas/webgl/resources/desktop-gl-constants.js b/LayoutTests/webgl/resources/desktop-gl-constants.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/desktop-gl-constants.js >rename to LayoutTests/webgl/resources/desktop-gl-constants.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/floatArrayUniformShader.vert b/LayoutTests/webgl/resources/floatArrayUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/floatArrayUniformShader.vert >rename to LayoutTests/webgl/resources/floatArrayUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/floatUniformShader.vert b/LayoutTests/webgl/resources/floatUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/floatUniformShader.vert >rename to LayoutTests/webgl/resources/floatUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag b/LayoutTests/webgl/resources/fragmentShader.frag >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/fragmentShader.frag >rename to LayoutTests/webgl/resources/fragmentShader.frag >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-256-with-128-alpha.png b/LayoutTests/webgl/resources/gray-ramp-256-with-128-alpha.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-256-with-128-alpha.png >rename to LayoutTests/webgl/resources/gray-ramp-256-with-128-alpha.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-256.png b/LayoutTests/webgl/resources/gray-ramp-256.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-256.png >rename to LayoutTests/webgl/resources/gray-ramp-256.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-default-gamma.png b/LayoutTests/webgl/resources/gray-ramp-default-gamma.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-default-gamma.png >rename to LayoutTests/webgl/resources/gray-ramp-default-gamma.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma0.1.png b/LayoutTests/webgl/resources/gray-ramp-gamma0.1.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma0.1.png >rename to LayoutTests/webgl/resources/gray-ramp-gamma0.1.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma1.0.png b/LayoutTests/webgl/resources/gray-ramp-gamma1.0.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma1.0.png >rename to LayoutTests/webgl/resources/gray-ramp-gamma1.0.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma2.0.png b/LayoutTests/webgl/resources/gray-ramp-gamma2.0.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma2.0.png >rename to LayoutTests/webgl/resources/gray-ramp-gamma2.0.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma4.0.png b/LayoutTests/webgl/resources/gray-ramp-gamma4.0.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma4.0.png >rename to LayoutTests/webgl/resources/gray-ramp-gamma4.0.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma9.0.png b/LayoutTests/webgl/resources/gray-ramp-gamma9.0.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp-gamma9.0.png >rename to LayoutTests/webgl/resources/gray-ramp-gamma9.0.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/gray-ramp.png b/LayoutTests/webgl/resources/gray-ramp.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/gray-ramp.png >rename to LayoutTests/webgl/resources/gray-ramp.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/green-2x2-16bit.png b/LayoutTests/webgl/resources/green-2x2-16bit.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/green-2x2-16bit.png >rename to LayoutTests/webgl/resources/green-2x2-16bit.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/intArrayUniformShader.vert b/LayoutTests/webgl/resources/intArrayUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/intArrayUniformShader.vert >rename to LayoutTests/webgl/resources/intArrayUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/intArrayUniformShader2.vert b/LayoutTests/webgl/resources/intArrayUniformShader2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/intArrayUniformShader2.vert >rename to LayoutTests/webgl/resources/intArrayUniformShader2.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/intUniformShader.vert b/LayoutTests/webgl/resources/intUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/intUniformShader.vert >rename to LayoutTests/webgl/resources/intUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/matUniformShader.vert b/LayoutTests/webgl/resources/matUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/matUniformShader.vert >rename to LayoutTests/webgl/resources/matUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/noopUniformShader.frag b/LayoutTests/webgl/resources/noopUniformShader.frag >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/noopUniformShader.frag >rename to LayoutTests/webgl/resources/noopUniformShader.frag >diff --git a/LayoutTests/fast/canvas/webgl/resources/noopUniformShader.vert b/LayoutTests/webgl/resources/noopUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/noopUniformShader.vert >rename to LayoutTests/webgl/resources/noopUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/pnglib.js b/LayoutTests/webgl/resources/pnglib.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/pnglib.js >rename to LayoutTests/webgl/resources/pnglib.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/red-green.mp4 b/LayoutTests/webgl/resources/red-green.mp4 >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/red-green.mp4 >rename to LayoutTests/webgl/resources/red-green.mp4 >diff --git a/LayoutTests/fast/canvas/webgl/resources/red-green.png b/LayoutTests/webgl/resources/red-green.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/red-green.png >rename to LayoutTests/webgl/resources/red-green.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/red-green.theora.ogv b/LayoutTests/webgl/resources/red-green.theora.ogv >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/red-green.theora.ogv >rename to LayoutTests/webgl/resources/red-green.theora.ogv >diff --git a/LayoutTests/fast/canvas/webgl/resources/red-green.webmvp8.webm b/LayoutTests/webgl/resources/red-green.webmvp8.webm >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/red-green.webmvp8.webm >rename to LayoutTests/webgl/resources/red-green.webmvp8.webm >diff --git a/LayoutTests/fast/canvas/webgl/resources/red-indexed.png b/LayoutTests/webgl/resources/red-indexed.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/red-indexed.png >rename to LayoutTests/webgl/resources/red-indexed.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/samplerUniformShader.frag b/LayoutTests/webgl/resources/samplerUniformShader.frag >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/samplerUniformShader.frag >rename to LayoutTests/webgl/resources/samplerUniformShader.frag >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-cie-rgb-profile.png b/LayoutTests/webgl/resources/small-square-with-cie-rgb-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-cie-rgb-profile.png >rename to LayoutTests/webgl/resources/small-square-with-cie-rgb-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-colormatch-profile.png b/LayoutTests/webgl/resources/small-square-with-colormatch-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-colormatch-profile.png >rename to LayoutTests/webgl/resources/small-square-with-colormatch-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-colorspin-profile.jpg b/LayoutTests/webgl/resources/small-square-with-colorspin-profile.jpg >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-colorspin-profile.jpg >rename to LayoutTests/webgl/resources/small-square-with-colorspin-profile.jpg >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-colorspin-profile.png b/LayoutTests/webgl/resources/small-square-with-colorspin-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-colorspin-profile.png >rename to LayoutTests/webgl/resources/small-square-with-colorspin-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-e-srgb-profile.png b/LayoutTests/webgl/resources/small-square-with-e-srgb-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-e-srgb-profile.png >rename to LayoutTests/webgl/resources/small-square-with-e-srgb-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-smpte-c-profile.png b/LayoutTests/webgl/resources/small-square-with-smpte-c-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-smpte-c-profile.png >rename to LayoutTests/webgl/resources/small-square-with-smpte-c-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/small-square-with-srgb-iec61966-2.1-profile.png b/LayoutTests/webgl/resources/small-square-with-srgb-iec61966-2.1-profile.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/small-square-with-srgb-iec61966-2.1-profile.png >rename to LayoutTests/webgl/resources/small-square-with-srgb-iec61966-2.1-profile.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/structUniformShader.vert b/LayoutTests/webgl/resources/structUniformShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/structUniformShader.vert >rename to LayoutTests/webgl/resources/structUniformShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/tan-1x1-with-alpha.png b/LayoutTests/webgl/resources/tan-1x1-with-alpha.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/tan-1x1-with-alpha.png >rename to LayoutTests/webgl/resources/tan-1x1-with-alpha.png >diff --git a/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js b/LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js >rename to LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-canvas.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js b/LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js >rename to LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-image-data.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image.js b/LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-image.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-image.js >rename to LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-image.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-video.js b/LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-video.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/tex-image-and-sub-image-2d-with-video.js >rename to LayoutTests/webgl/resources/tex-image-and-sub-image-2d-with-video.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/vertexShader.vert b/LayoutTests/webgl/resources/vertexShader.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/vertexShader.vert >rename to LayoutTests/webgl/resources/vertexShader.vert >diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js b/LayoutTests/webgl/resources/webgl-test-utils.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/webgl-test-utils.js >rename to LayoutTests/webgl/resources/webgl-test-utils.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/webgl-test.js b/LayoutTests/webgl/resources/webgl-test.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/webgl-test.js >rename to LayoutTests/webgl/resources/webgl-test.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/worker-data-view-test.js b/LayoutTests/webgl/resources/worker-data-view-test.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/worker-data-view-test.js >rename to LayoutTests/webgl/resources/worker-data-view-test.js >diff --git a/LayoutTests/fast/canvas/webgl/resources/zero-alpha.png b/LayoutTests/webgl/resources/zero-alpha.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/resources/zero-alpha.png >rename to LayoutTests/webgl/resources/zero-alpha.png >diff --git a/LayoutTests/fast/canvas/webgl/script-tests/array-message-passing.js b/LayoutTests/webgl/script-tests/array-message-passing.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/script-tests/array-message-passing.js >rename to LayoutTests/webgl/script-tests/array-message-passing.js >diff --git a/LayoutTests/fast/canvas/webgl/script-tests/arraybuffer-transfer-of-control.js b/LayoutTests/webgl/script-tests/arraybuffer-transfer-of-control.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/script-tests/arraybuffer-transfer-of-control.js >rename to LayoutTests/webgl/script-tests/arraybuffer-transfer-of-control.js >diff --git a/LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js b/LayoutTests/webgl/script-tests/texImageTest.js >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/script-tests/texImageTest.js >rename to LayoutTests/webgl/script-tests/texImageTest.js >diff --git a/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor-expected.txt b/LayoutTests/webgl/shader-deleted-by-accessor-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor-expected.txt >rename to LayoutTests/webgl/shader-deleted-by-accessor-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html b/LayoutTests/webgl/shader-deleted-by-accessor.html >similarity index 89% >rename from LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html >rename to LayoutTests/webgl/shader-deleted-by-accessor.html >index 1534818..d4a9feb 100644 >--- a/LayoutTests/fast/canvas/webgl/shader-deleted-by-accessor.html >+++ b/LayoutTests/webgl/shader-deleted-by-accessor.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -37,7 +37,7 @@ for (var i = 0; i < 10; ++i) { > } > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/shader-precision-format-expected.txt b/LayoutTests/webgl/shader-precision-format-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shader-precision-format-expected.txt >rename to LayoutTests/webgl/shader-precision-format-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/shader-precision-format.html b/LayoutTests/webgl/shader-precision-format.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/shader-precision-format.html >rename to LayoutTests/webgl/shader-precision-format.html >index 4ebf63a..b1c7941 100644 >--- a/LayoutTests/fast/canvas/webgl/shader-precision-format.html >+++ b/LayoutTests/webgl/shader-precision-format.html >@@ -3,8 +3,8 @@ > <head> > <meta charset="utf-8"> > <title>WebGL shader precision format test.</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/shaders/00_shaders.txt b/LayoutTests/webgl/shaders/00_shaders.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/00_shaders.txt >rename to LayoutTests/webgl/shaders/00_shaders.txt >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/00_shaders.txt b/LayoutTests/webgl/shaders/implicit/00_shaders.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/00_shaders.txt >rename to LayoutTests/webgl/shaders/implicit/00_shaders.txt >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_float.vert b/LayoutTests/webgl/shaders/implicit/add_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat2.vert b/LayoutTests/webgl/shaders/implicit/add_int_mat2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat2.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_mat2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat3.vert b/LayoutTests/webgl/shaders/implicit/add_int_mat3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat3.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_mat3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat4.vert b/LayoutTests/webgl/shaders/implicit/add_int_mat4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_mat4.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_mat4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec2.vert b/LayoutTests/webgl/shaders/implicit/add_int_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec3.vert b/LayoutTests/webgl/shaders/implicit/add_int_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec4.vert b/LayoutTests/webgl/shaders/implicit/add_int_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_int_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/add_int_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/add_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/add_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/add_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/add_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/add_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/add_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/add_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/assign_int_to_float.vert b/LayoutTests/webgl/shaders/implicit/assign_int_to_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/assign_int_to_float.vert >rename to LayoutTests/webgl/shaders/implicit/assign_int_to_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec2_to_vec2.vert b/LayoutTests/webgl/shaders/implicit/assign_ivec2_to_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec2_to_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/assign_ivec2_to_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec3_to_vec3.vert b/LayoutTests/webgl/shaders/implicit/assign_ivec3_to_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec3_to_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/assign_ivec3_to_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec4_to_vec4.vert b/LayoutTests/webgl/shaders/implicit/assign_ivec4_to_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/assign_ivec4_to_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/assign_ivec4_to_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/construct_struct.vert b/LayoutTests/webgl/shaders/implicit/construct_struct.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/construct_struct.vert >rename to LayoutTests/webgl/shaders/implicit/construct_struct.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_float.vert b/LayoutTests/webgl/shaders/implicit/divide_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat2.vert b/LayoutTests/webgl/shaders/implicit/divide_int_mat2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat2.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_mat2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat3.vert b/LayoutTests/webgl/shaders/implicit/divide_int_mat3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat3.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_mat3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat4.vert b/LayoutTests/webgl/shaders/implicit/divide_int_mat4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_mat4.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_mat4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec2.vert b/LayoutTests/webgl/shaders/implicit/divide_int_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec3.vert b/LayoutTests/webgl/shaders/implicit/divide_int_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec4.vert b/LayoutTests/webgl/shaders/implicit/divide_int_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_int_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/divide_int_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/divide_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/divide_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/divide_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/divide_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/divide_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/divide_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/divide_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/equal_int_float.vert b/LayoutTests/webgl/shaders/implicit/equal_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/equal_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/equal_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/equal_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/equal_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/equal_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/equal_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/equal_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/equal_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/equal_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/function_int_float.vert b/LayoutTests/webgl/shaders/implicit/function_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/function_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/function_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/function_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/function_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/function_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/function_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/function_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/function_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/function_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/greater_than.vert b/LayoutTests/webgl/shaders/implicit/greater_than.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/greater_than.vert >rename to LayoutTests/webgl/shaders/implicit/greater_than.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/greater_than_equal.vert b/LayoutTests/webgl/shaders/implicit/greater_than_equal.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/greater_than_equal.vert >rename to LayoutTests/webgl/shaders/implicit/greater_than_equal.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/less_than.vert b/LayoutTests/webgl/shaders/implicit/less_than.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/less_than.vert >rename to LayoutTests/webgl/shaders/implicit/less_than.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/less_than_equal.vert b/LayoutTests/webgl/shaders/implicit/less_than_equal.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/less_than_equal.vert >rename to LayoutTests/webgl/shaders/implicit/less_than_equal.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_float.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat2.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_mat2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat2.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_mat2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat3.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_mat3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat3.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_mat3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat4.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_mat4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_mat4.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_mat4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec2.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec3.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec4.vert b/LayoutTests/webgl/shaders/implicit/multiply_int_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_int_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_int_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/multiply_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/multiply_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/multiply_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/multiply_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/multiply_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_int_float.vert b/LayoutTests/webgl/shaders/implicit/not_equal_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/not_equal_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/not_equal_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/not_equal_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/not_equal_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/not_equal_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/not_equal_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/not_equal_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/not_equal_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_float.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat2.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_mat2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat2.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_mat2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat3.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_mat3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat3.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_mat3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat4.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_mat4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_mat4.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_mat4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec2.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec3.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec4.vert b/LayoutTests/webgl/shaders/implicit/subtract_int_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_int_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_int_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/subtract_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/subtract_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/subtract_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/subtract_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/subtract_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_int_float.vert b/LayoutTests/webgl/shaders/implicit/ternary_int_float.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_int_float.vert >rename to LayoutTests/webgl/shaders/implicit/ternary_int_float.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec2_vec2.vert b/LayoutTests/webgl/shaders/implicit/ternary_ivec2_vec2.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec2_vec2.vert >rename to LayoutTests/webgl/shaders/implicit/ternary_ivec2_vec2.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec3_vec3.vert b/LayoutTests/webgl/shaders/implicit/ternary_ivec3_vec3.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec3_vec3.vert >rename to LayoutTests/webgl/shaders/implicit/ternary_ivec3_vec3.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec4_vec4.vert b/LayoutTests/webgl/shaders/implicit/ternary_ivec4_vec4.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/implicit/ternary_ivec4_vec4.vert >rename to LayoutTests/webgl/shaders/implicit/ternary_ivec4_vec4.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/misc/00_shaders.txt b/LayoutTests/webgl/shaders/misc/00_shaders.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/misc/00_shaders.txt >rename to LayoutTests/webgl/shaders/misc/00_shaders.txt >diff --git a/LayoutTests/fast/canvas/webgl/shaders/misc/non-ascii-comments.vert b/LayoutTests/webgl/shaders/misc/non-ascii-comments.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/misc/non-ascii-comments.vert >rename to LayoutTests/webgl/shaders/misc/non-ascii-comments.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/misc/non-ascii.vert b/LayoutTests/webgl/shaders/misc/non-ascii.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/misc/non-ascii.vert >rename to LayoutTests/webgl/shaders/misc/non-ascii.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/00_shaders.txt b/LayoutTests/webgl/shaders/reserved/00_shaders.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/00_shaders.txt >rename to LayoutTests/webgl/shaders/reserved/00_shaders.txt >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_field.vert b/LayoutTests/webgl/shaders/reserved/_webgl_field.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_field.vert >rename to LayoutTests/webgl/shaders/reserved/_webgl_field.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_function.vert b/LayoutTests/webgl/shaders/reserved/_webgl_function.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_function.vert >rename to LayoutTests/webgl/shaders/reserved/_webgl_function.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_struct.vert b/LayoutTests/webgl/shaders/reserved/_webgl_struct.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_struct.vert >rename to LayoutTests/webgl/shaders/reserved/_webgl_struct.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_variable.vert b/LayoutTests/webgl/shaders/reserved/_webgl_variable.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/_webgl_variable.vert >rename to LayoutTests/webgl/shaders/reserved/_webgl_variable.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_field.vert b/LayoutTests/webgl/shaders/reserved/webgl_field.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_field.vert >rename to LayoutTests/webgl/shaders/reserved/webgl_field.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_function.vert b/LayoutTests/webgl/shaders/reserved/webgl_function.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_function.vert >rename to LayoutTests/webgl/shaders/reserved/webgl_function.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_struct.vert b/LayoutTests/webgl/shaders/reserved/webgl_struct.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_struct.vert >rename to LayoutTests/webgl/shaders/reserved/webgl_struct.vert >diff --git a/LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_variable.vert b/LayoutTests/webgl/shaders/reserved/webgl_variable.vert >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/shaders/reserved/webgl_variable.vert >rename to LayoutTests/webgl/shaders/reserved/webgl_variable.vert >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-array-buffer-view-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-array-buffer-view-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html >index c18bd44d..6d893d3 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-array-buffer-view.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -178,6 +178,6 @@ textureLoc = gl.getUniformLocation(program, "tex"); > > runTest(); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html >index a2c2eb4..2941e0f 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgb565.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html >index bb1f7df..9860743 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba4444.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html >index 9a556af..509c604 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas-rgba5551.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas.html >index a99eec7..cb57678 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-canvas.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-canvas.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-canvas.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html >similarity index 81% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html >index e89496a..796eb75 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgb565.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html >similarity index 81% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html >index d9c231a..8d5bfc1 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba4444.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html >similarity index 81% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html >index 2ecb6a6..8bf85a6 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data-rgba5551.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data.html >similarity index 81% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data.html >index c364833..5c41d41 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-data.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-data.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image-data.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgb565-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html >index 7016cc6..e925db36 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgb565.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba4444-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html >index 54b01c9..c218328 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba4444.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba5551-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html >index eafa8eb..a8016f3 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image-rgba5551.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image.html >similarity index 79% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-image.html >index d23aff6..70c9fce 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-image.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-image.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-image.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgb565-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgb565-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html >similarity index 86% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html >index eb62214..d7cef06 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgb565.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-video.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba4444-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba4444-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html >similarity index 86% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html >index 7b22f4f1..2d3a6ee 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba4444.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-video.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551-expected.txt b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba5551-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551-expected.txt >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba5551-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html >similarity index 86% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html >index fbf8eb7..4b47322 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video-rgba5551.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-video.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video.html >similarity index 86% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html >rename to LayoutTests/webgl/tex-image-and-sub-image-2d-with-video.html >index 9f9e107..eecd87d 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html >+++ b/LayoutTests/webgl/tex-image-and-sub-image-2d-with-video.html >@@ -2,8 +2,8 @@ > <html> > <head> > <meta charset="utf-8"> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script src="resources/tex-image-and-sub-image-2d-with-video.js"></script> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs-expected.txt b/LayoutTests/webgl/tex-image-and-uniform-binding-bugs-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs-expected.txt >rename to LayoutTests/webgl/tex-image-and-uniform-binding-bugs-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html b/LayoutTests/webgl/tex-image-and-uniform-binding-bugs.html >similarity index 88% >rename from LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html >rename to LayoutTests/webgl/tex-image-and-uniform-binding-bugs.html >index 5f6aabc..fcbcae5 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-and-uniform-binding-bugs.html >+++ b/LayoutTests/webgl/tex-image-and-uniform-binding-bugs.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -26,7 +26,7 @@ shouldBeUndefined("gl.bindTexture(gl.TEXTURE_2D, texture)"); > shouldBeUndefined("gl.texImage2D(gl.TEXTURE_2D, 0, gl.RGBA, gl.RGBA, gl.UNSIGNED_BYTE, tmpcanvas)"); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-webgl-expected.txt b/LayoutTests/webgl/tex-image-webgl-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-webgl-expected.txt >rename to LayoutTests/webgl/tex-image-webgl-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-webgl.html b/LayoutTests/webgl/tex-image-webgl.html >similarity index 93% >rename from LayoutTests/fast/canvas/webgl/tex-image-webgl.html >rename to LayoutTests/webgl/tex-image-webgl.html >index 766464b..703f82b 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-webgl.html >+++ b/LayoutTests/webgl/tex-image-webgl.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL texImage2D from WebGL conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -52,7 +52,7 @@ wtu.checkCanvas(gl, [0, 255, 0, 255], "Canvas should be green"); > debug(""); > successfullyParsed = true; > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type-expected.txt b/LayoutTests/webgl/tex-image-with-format-and-type-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type-expected.txt >rename to LayoutTests/webgl/tex-image-with-format-and-type-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.html b/LayoutTests/webgl/tex-image-with-format-and-type.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.html >rename to LayoutTests/webgl/tex-image-with-format-and-type.html >index 36bc36d..9a236f6 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-image-with-format-and-type.html >+++ b/LayoutTests/webgl/tex-image-with-format-and-type.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/pnglib.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> >@@ -352,7 +352,7 @@ function maybeRunTests() > runOneTest(testCases[i]); > var epilogue = document.createElement("script"); > epilogue.onload = finish; >- epilogue.src = "../../js/resources/js-test-post.js"; >+ epilogue.src = "../fast/js/resources/js-test-post.js"; > document.body.appendChild(epilogue); > } > >diff --git a/LayoutTests/fast/canvas/webgl/tex-input-validation-expected.txt b/LayoutTests/webgl/tex-input-validation-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-input-validation-expected.txt >rename to LayoutTests/webgl/tex-input-validation-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-input-validation.html b/LayoutTests/webgl/tex-input-validation.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/tex-input-validation.html >rename to LayoutTests/webgl/tex-input-validation.html >index 8d581d3..d2a1d4b 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-input-validation.html >+++ b/LayoutTests/webgl/tex-input-validation.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -349,6 +349,6 @@ for (var ii = 0; ii < testCases.length; ++ii) > testCopyFromInternalFBO(testCases[ii]); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args-expected.txt b/LayoutTests/webgl/tex-sub-image-2d-bad-args-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args-expected.txt >rename to LayoutTests/webgl/tex-sub-image-2d-bad-args-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html b/LayoutTests/webgl/tex-sub-image-2d-bad-args.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html >rename to LayoutTests/webgl/tex-sub-image-2d-bad-args.html >index de88bbe..02ebd11 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-bad-args.html >+++ b/LayoutTests/webgl/tex-sub-image-2d-bad-args.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -64,6 +64,6 @@ glErrorShouldBe(gl, gl.INVALID_OPERATION, "format not same as original RGBA 4_4_ > gl.texSubImage2D(gl.TEXTURE_2D, 0, 0,0, gl.RGBA, gl.UNSIGNED_BYTE, c); > glErrorShouldBe(gl, gl.INVALID_OPERATION, "type not same as original RGBA 4_4_4_4"); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d-expected.txt b/LayoutTests/webgl/tex-sub-image-2d-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-2d-expected.txt >rename to LayoutTests/webgl/tex-sub-image-2d-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html b/LayoutTests/webgl/tex-sub-image-2d.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html >rename to LayoutTests/webgl/tex-sub-image-2d.html >index 285f3cc..daacb7f 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-2d.html >+++ b/LayoutTests/webgl/tex-sub-image-2d.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script id="fshader" type="x-shader/x-fragment"> >@@ -86,6 +86,6 @@ for (var i = 0; i < textureWidth; i++) { > if (passed) > testPassed(""); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps-expected.txt b/LayoutTests/webgl/tex-sub-image-cube-maps-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps-expected.txt >rename to LayoutTests/webgl/tex-sub-image-cube-maps-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html b/LayoutTests/webgl/tex-sub-image-cube-maps.html >similarity index 87% >rename from LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html >rename to LayoutTests/webgl/tex-sub-image-cube-maps.html >index fcd545c..72def9f 100644 >--- a/LayoutTests/fast/canvas/webgl/tex-sub-image-cube-maps.html >+++ b/LayoutTests/webgl/tex-sub-image-cube-maps.html >@@ -1,36 +1,9 @@ >-<!-- >- >-/* >-** Copyright (c) 2012 The Khronos Group Inc. >-** >-** Permission is hereby granted, free of charge, to any person obtaining a >-** copy of this software and/or associated documentation files (the >-** "Materials"), to deal in the Materials without restriction, including >-** without limitation the rights to use, copy, modify, merge, publish, >-** distribute, sublicense, and/or sell copies of the Materials, and to >-** permit persons to whom the Materials are furnished to do so, subject to >-** the following conditions: >-** >-** The above copyright notice and this permission notice shall be included >-** in all copies or substantial portions of the Materials. >-** >-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF >-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. >-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY >-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, >-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE >-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. >-*/ >- >---> >- > <!DOCTYPE html> > <html> > <head> > <meta charset="utf-8"> > <title>WebGL texture texSubImage2Ds cube map conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -328,7 +301,7 @@ function mulMatrix(a, b) { > > successfullyParsed = true; > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest-expected.txt b/LayoutTests/webgl/texImage2DImageDataTest-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texImage2DImageDataTest-expected.txt >rename to LayoutTests/webgl/texImage2DImageDataTest-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html b/LayoutTests/webgl/texImage2DImageDataTest.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texImage2DImageDataTest.html >rename to LayoutTests/webgl/texImage2DImageDataTest.html >diff --git a/LayoutTests/fast/canvas/webgl/texImageTest-expected.txt b/LayoutTests/webgl/texImageTest-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texImageTest-expected.txt >rename to LayoutTests/webgl/texImageTest-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texImageTest.html b/LayoutTests/webgl/texImageTest.html >similarity index 62% >rename from LayoutTests/fast/canvas/webgl/texImageTest.html >rename to LayoutTests/webgl/texImageTest.html >index bdf9171..2e626c5 100644 >--- a/LayoutTests/fast/canvas/webgl/texImageTest.html >+++ b/LayoutTests/webgl/texImageTest.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -9,6 +9,6 @@ > > <script src="script-tests/texImageTest.js"></script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/texture-active-bind-expected.txt b/LayoutTests/webgl/texture-active-bind-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-active-bind-expected.txt >rename to LayoutTests/webgl/texture-active-bind-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-active-bind.html b/LayoutTests/webgl/texture-active-bind.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/texture-active-bind.html >rename to LayoutTests/webgl/texture-active-bind.html >index b1c9bc1..1e1944c 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-active-bind.html >+++ b/LayoutTests/webgl/texture-active-bind.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL ActiveTexture BindTexture conformance test.</title> >- <script src="../../js/resources/js-test-pre.js"></script> >+ <script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > </head> > <body> >@@ -149,7 +149,7 @@ function init() > init(); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize-expected.txt b/LayoutTests/webgl/texture-bindings-uneffected-on-resize-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize-expected.txt >rename to LayoutTests/webgl/texture-bindings-uneffected-on-resize-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html b/LayoutTests/webgl/texture-bindings-uneffected-on-resize.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html >rename to LayoutTests/webgl/texture-bindings-uneffected-on-resize.html >index 3bc500b..eed20a7 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-bindings-uneffected-on-resize.html >+++ b/LayoutTests/webgl/texture-bindings-uneffected-on-resize.html >@@ -1,7 +1,7 @@ > <html> > <head> > <meta charset="utf-8"> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/texture-color-profile-expected.txt b/LayoutTests/webgl/texture-color-profile-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-color-profile-expected.txt >rename to LayoutTests/webgl/texture-color-profile-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-color-profile.html b/LayoutTests/webgl/texture-color-profile.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/texture-color-profile.html >rename to LayoutTests/webgl/texture-color-profile.html >index ed9e70b..f96879e 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-color-profile.html >+++ b/LayoutTests/webgl/texture-color-profile.html >@@ -2,8 +2,8 @@ > <html> > <head> > <title>Texture upload with color profile</title> >-<link rel="stylesheet" href="../../js/resources/js-test-style.css"/> >-<script src="../../js/resources/js-test-pre.js"></script> >+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css"/> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >diff --git a/LayoutTests/fast/canvas/webgl/texture-complete-expected.txt b/LayoutTests/webgl/texture-complete-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-complete-expected.txt >rename to LayoutTests/webgl/texture-complete-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-complete.html b/LayoutTests/webgl/texture-complete.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/texture-complete.html >rename to LayoutTests/webgl/texture-complete.html >index 7b15fd5..6769cb1 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-complete.html >+++ b/LayoutTests/webgl/texture-complete.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL "Texture Complete" texture conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > </head> > <body> >@@ -122,7 +122,7 @@ function init() > init(); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/texture-npot-expected.txt b/LayoutTests/webgl/texture-npot-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-npot-expected.txt >rename to LayoutTests/webgl/texture-npot-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-npot.html b/LayoutTests/webgl/texture-npot.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/texture-npot.html >rename to LayoutTests/webgl/texture-npot.html >index 3129a03..37fda3b 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-npot.html >+++ b/LayoutTests/webgl/texture-npot.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>WebGL Non-Power of 2 texture conformance test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -219,7 +219,7 @@ function fillCubeTexture(gl, tex, width, height, color, opt_level) { > > </script> > </body> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > <script> > </script> >diff --git a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized-expected.txt b/LayoutTests/webgl/texture-transparent-pixels-initialized-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized-expected.txt >rename to LayoutTests/webgl/texture-transparent-pixels-initialized-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html b/LayoutTests/webgl/texture-transparent-pixels-initialized.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html >rename to LayoutTests/webgl/texture-transparent-pixels-initialized.html >index 747f12f..c3c81d3 100644 >--- a/LayoutTests/fast/canvas/webgl/texture-transparent-pixels-initialized.html >+++ b/LayoutTests/webgl/texture-transparent-pixels-initialized.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <script> >@@ -71,7 +71,7 @@ function runTest() > "shouldBe " + color); > var epilogue = document.createElement("script"); > epilogue.onload = finish; >- epilogue.src = "../../js/resources/js-test-post.js"; >+ epilogue.src = "../fast/js/resources/js-test-post.js"; > document.body.appendChild(epilogue); > } > >diff --git a/LayoutTests/fast/canvas/webgl/triangle-expected.txt b/LayoutTests/webgl/triangle-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/triangle-expected.txt >rename to LayoutTests/webgl/triangle-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/triangle.html b/LayoutTests/webgl/triangle.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/triangle.html >rename to LayoutTests/webgl/triangle.html >index 3ba15d9..0736751 100644 >--- a/LayoutTests/fast/canvas/webgl/triangle.html >+++ b/LayoutTests/webgl/triangle.html >@@ -3,7 +3,7 @@ > <html> > <head> > <title>Rendering Test</title> >- <script src="../../js/resources/js-test-pre.js"></script> >+ <script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > </head> > <body> >@@ -89,7 +89,7 @@ There is supposed to be an example drawing here, but it's not important. > init(); > </script> > </body> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/type-conversion-test-expected.txt b/LayoutTests/webgl/type-conversion-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/type-conversion-test-expected.txt >rename to LayoutTests/webgl/type-conversion-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/type-conversion-test.html b/LayoutTests/webgl/type-conversion-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/type-conversion-test.html >rename to LayoutTests/webgl/type-conversion-test.html >index 2796bdc..53f0257 100644 >--- a/LayoutTests/fast/canvas/webgl/type-conversion-test.html >+++ b/LayoutTests/webgl/type-conversion-test.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -138,7 +138,7 @@ for (var i = 0; i < args.length; ++i) { > } > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow-expected.txt b/LayoutTests/webgl/uniform-array-length-overflow-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/uniform-array-length-overflow-expected.txt >rename to LayoutTests/webgl/uniform-array-length-overflow-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html b/LayoutTests/webgl/uniform-array-length-overflow.html >similarity index 88% >rename from LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html >rename to LayoutTests/webgl/uniform-array-length-overflow.html >index b1e89ce..04c8816 100644 >--- a/LayoutTests/fast/canvas/webgl/uniform-array-length-overflow.html >+++ b/LayoutTests/webgl/uniform-array-length-overflow.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -32,6 +32,6 @@ try { > } catch (e) { } > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/uniform-location-expected.txt b/LayoutTests/webgl/uniform-location-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/uniform-location-expected.txt >rename to LayoutTests/webgl/uniform-location-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/uniform-location-length-limits-expected.txt b/LayoutTests/webgl/uniform-location-length-limits-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/uniform-location-length-limits-expected.txt >rename to LayoutTests/webgl/uniform-location-length-limits-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html b/LayoutTests/webgl/uniform-location-length-limits.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html >rename to LayoutTests/webgl/uniform-location-length-limits.html >index 012cb06..58ea94f 100644 >--- a/LayoutTests/fast/canvas/webgl/uniform-location-length-limits.html >+++ b/LayoutTests/webgl/uniform-location-length-limits.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL uniform location length tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"> </script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -103,6 +103,6 @@ wtu.glErrorShouldBe(gl, gl.INVALID_VALUE); > shouldBeNull('uniformLoc'); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/uniform-location.html b/LayoutTests/webgl/uniform-location.html >similarity index 96% >rename from LayoutTests/fast/canvas/webgl/uniform-location.html >rename to LayoutTests/webgl/uniform-location.html >index 5394660..ca2372f 100644 >--- a/LayoutTests/fast/canvas/webgl/uniform-location.html >+++ b/LayoutTests/webgl/uniform-location.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -67,6 +67,6 @@ shouldGenerateGLError(contextA, contextA.NO_ERROR, "contextA.uniform1i(locationS > shouldBe("contextA.getUniform(programS, locationSx)", "3"); > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/uninitialized-test-expected.txt b/LayoutTests/webgl/uninitialized-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/uninitialized-test-expected.txt >rename to LayoutTests/webgl/uninitialized-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/uninitialized-test.html b/LayoutTests/webgl/uninitialized-test.html >similarity index 98% >rename from LayoutTests/fast/canvas/webgl/uninitialized-test.html >rename to LayoutTests/webgl/uninitialized-test.html >index 3c2d5b8..f3103cb 100644 >--- a/LayoutTests/fast/canvas/webgl/uninitialized-test.html >+++ b/LayoutTests/webgl/uninitialized-test.html >@@ -3,7 +3,7 @@ > <head> > <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> > <title>WebGL Uninitialized GL Resources Tests</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -237,7 +237,7 @@ glErrorShouldBe(gl, gl.NO_ERROR); > > debug(""); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> > >diff --git a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize-expected.txt b/LayoutTests/webgl/viewport-unchanged-upon-resize-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize-expected.txt >rename to LayoutTests/webgl/viewport-unchanged-upon-resize-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html b/LayoutTests/webgl/viewport-unchanged-upon-resize.html >similarity index 95% >rename from LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html >rename to LayoutTests/webgl/viewport-unchanged-upon-resize.html >index 26314a7..4f48130 100644 >--- a/LayoutTests/fast/canvas/webgl/viewport-unchanged-upon-resize.html >+++ b/LayoutTests/webgl/viewport-unchanged-upon-resize.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script id="vshader" type="x-shader/x-vertex"> > attribute vec3 g_Position; >@@ -88,6 +88,6 @@ if (passed) { > if (passed) > testPassed("Viewport correctly did not change size during canvas resize"); > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt b/LayoutTests/webgl/webgl-array-invalid-ranges-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges-expected.txt >rename to LayoutTests/webgl/webgl-array-invalid-ranges-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html b/LayoutTests/webgl/webgl-array-invalid-ranges.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html >rename to LayoutTests/webgl/webgl-array-invalid-ranges.html >index 37ac73a..13ceda2a 100644 >--- a/LayoutTests/fast/canvas/webgl/webgl-array-invalid-ranges.html >+++ b/LayoutTests/webgl/webgl-array-invalid-ranges.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -155,7 +155,7 @@ ints[0]=-0x7ffff; > shouldBeTrue("isNaN(floats[0])"); > > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-expected.png b/LayoutTests/webgl/webgl-composite-modes-expected.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes-expected.png >rename to LayoutTests/webgl/webgl-composite-modes-expected.png >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-expected.txt b/LayoutTests/webgl/webgl-composite-modes-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes-expected.txt >rename to LayoutTests/webgl/webgl-composite-modes-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint-expected.png b/LayoutTests/webgl/webgl-composite-modes-repaint-expected.png >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint-expected.png >rename to LayoutTests/webgl/webgl-composite-modes-repaint-expected.png >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint-expected.txt b/LayoutTests/webgl/webgl-composite-modes-repaint-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint-expected.txt >rename to LayoutTests/webgl/webgl-composite-modes-repaint-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html b/LayoutTests/webgl/webgl-composite-modes-repaint.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes-repaint.html >rename to LayoutTests/webgl/webgl-composite-modes-repaint.html >diff --git a/LayoutTests/fast/canvas/webgl/webgl-composite-modes.html b/LayoutTests/webgl/webgl-composite-modes.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-composite-modes.html >rename to LayoutTests/webgl/webgl-composite-modes.html >diff --git a/LayoutTests/fast/canvas/webgl/webgl-depth-texture-expected.txt b/LayoutTests/webgl/webgl-depth-texture-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-depth-texture-expected.txt >rename to LayoutTests/webgl/webgl-depth-texture-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-depth-texture.html b/LayoutTests/webgl/webgl-depth-texture.html >similarity index 99% >rename from LayoutTests/fast/canvas/webgl/webgl-depth-texture.html >rename to LayoutTests/webgl/webgl-depth-texture.html >index e06f862..7fef288 100644 >--- a/LayoutTests/fast/canvas/webgl/webgl-depth-texture.html >+++ b/LayoutTests/webgl/webgl-depth-texture.html >@@ -2,7 +2,7 @@ > <html> > <head> > <meta charset="utf-8"> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > <title>WebGL WEBGL_depth_texture Conformance Tests</title> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-exceptions-expected.txt b/LayoutTests/webgl/webgl-exceptions-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-exceptions-expected.txt >rename to LayoutTests/webgl/webgl-exceptions-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-exceptions.html b/LayoutTests/webgl/webgl-exceptions.html >similarity index 84% >rename from LayoutTests/fast/canvas/webgl/webgl-exceptions.html >rename to LayoutTests/webgl/webgl-exceptions.html >index c1cbe13..068e498 100644 >--- a/LayoutTests/fast/canvas/webgl/webgl-exceptions.html >+++ b/LayoutTests/webgl/webgl-exceptions.html >@@ -1,7 +1,7 @@ > <!DOCTYPE html> > <html> > <head> >-<script src="../../../fast/js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > </head> > <body> >@@ -24,5 +24,5 @@ shouldThrow('gl.uniform1fv()'); > shouldThrow('gl.vertexAttrib1fv()'); > </script> > </body> >-<script src="../../../fast/js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt b/LayoutTests/webgl/webgl-specific-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt >rename to LayoutTests/webgl/webgl-specific-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific.html b/LayoutTests/webgl/webgl-specific.html >similarity index 97% >rename from LayoutTests/fast/canvas/webgl/webgl-specific.html >rename to LayoutTests/webgl/webgl-specific.html >index 6964bfd..bedf462 100644 >--- a/LayoutTests/fast/canvas/webgl/webgl-specific.html >+++ b/LayoutTests/webgl/webgl-specific.html >@@ -3,7 +3,7 @@ > <head> > <meta charset="utf-8"> > <title>WebGL GLES2 difference test.</title> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"></script> > </head> >@@ -101,6 +101,6 @@ shouldGenerateGLError(gl, gl.INVALID_OPERATION, "gl.bindAttribLocation(program, > successfullyParsed = true; > </script> > >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved-expected.txt b/LayoutTests/webgl/webgl-texture-binding-preserved-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved-expected.txt >rename to LayoutTests/webgl/webgl-texture-binding-preserved-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html b/LayoutTests/webgl/webgl-texture-binding-preserved.html >similarity index 94% >rename from LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html >rename to LayoutTests/webgl/webgl-texture-binding-preserved.html >index c75bfb1..a1b6932 100755 >--- a/LayoutTests/fast/canvas/webgl/webgl-texture-binding-preserved.html >+++ b/LayoutTests/webgl/webgl-texture-binding-preserved.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -64,7 +64,7 @@ window.onload = function() > setTimeout(draw, 100); > } > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > <canvas id="webgl-canvas" width="32px" height="32px"></canvas> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved-expected.txt b/LayoutTests/webgl/webgl-viewport-parameters-preserved-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved-expected.txt >rename to LayoutTests/webgl/webgl-viewport-parameters-preserved-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html b/LayoutTests/webgl/webgl-viewport-parameters-preserved.html >similarity index 92% >rename from LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html >rename to LayoutTests/webgl/webgl-viewport-parameters-preserved.html >index dbf3a80..fd99a2e 100755 >--- a/LayoutTests/fast/canvas/webgl/webgl-viewport-parameters-preserved.html >+++ b/LayoutTests/webgl/webgl-viewport-parameters-preserved.html >@@ -1,6 +1,6 @@ > <html> > <head> >-<script src="../../js/resources/js-test-pre.js"></script> >+<script src="../fast/js/resources/js-test-pre.js"></script> > <script src="resources/webgl-test.js"></script> > <script src="resources/webgl-test-utils.js"> </script> > </head> >@@ -54,7 +54,7 @@ window.onload = function() > setTimeout(draw, 0); > } > </script> >-<script src="../../js/resources/js-test-post.js"></script> >+<script src="../fast/js/resources/js-test-post.js"></script> > <canvas id="webgl-canvas" width="32px" height="32px"></canvas> > </body> > </html> >diff --git a/LayoutTests/fast/canvas/webgl/worker-data-view-test-expected.txt b/LayoutTests/webgl/worker-data-view-test-expected.txt >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/worker-data-view-test-expected.txt >rename to LayoutTests/webgl/worker-data-view-test-expected.txt >diff --git a/LayoutTests/fast/canvas/webgl/worker-data-view-test.html b/LayoutTests/webgl/worker-data-view-test.html >similarity index 100% >rename from LayoutTests/fast/canvas/webgl/worker-data-view-test.html >rename to LayoutTests/webgl/worker-data-view-test.html
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=185234">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 108189
:
185234
|
185238
|
185725
|
185761