Bug 946065 - Part 1: Move content/canvas/ to dom/ and flatten subdire…

…ctories. r=ehsan
mozilla-spidermonkey · Jul 25, 2014 · 4d3b523 · 4d3b523
1 parent d02ab4e
commit 4d3b523
Show file tree

Hide file tree

Showing 883 changed files with 142 additions and 159 deletions.
diff --git a/content/canvas/moz.build b/content/canvas/moz.build
diff --git a/content/canvas/public/moz.build b/content/canvas/public/moz.build
diff --git a/content/canvas/test/android.json b/content/canvas/test/android.json
diff --git a/content/canvas/test/image_green-redirect^headers^ b/content/canvas/test/image_green-redirect^headers^
diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp
@@ -37,7 +37,7 @@
 #include "ActiveLayerTracker.h"
 
 #ifdef MOZ_WEBGL
-#include "../canvas/src/WebGL2Context.h"
+#include "WebGL2Context.h"
 #endif
 
 using namespace mozilla::layers;

diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
@@ -171,11 +171,11 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/canvas/src',
     '/content/html/document/src',
     '/content/media/',
     '/content/xul/content/src',
     '/dom/base',
+    '/dom/canvas',
     '/dom/xbl',
     '/editor/libeditor/base',
     '/editor/libeditor/text',

diff --git a/content/moz.build b/content/moz.build
@@ -6,7 +6,6 @@
 
 PARALLEL_DIRS += [
     'base',
-    'canvas',
     'html',
     'mathml/content/src',
     'media',

diff --git a/content/test/reftest/reftest.list b/content/test/reftest/reftest.list
@@ -1,8 +1,3 @@
-# Canvas reftests
-# From: /content/test/reftest
-# To:   /content/canvas/test/reftest
-skip-if(xulFennec) include ../../canvas/test/reftest/reftest.list
-
 include ../../base/test/reftest/reftest.list # bug 920877
 
 == bug453105.html bug453105-ref.html

diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build
@@ -41,7 +41,6 @@ MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
-    '/content/canvas/src',
     '/content/html/content/src',
     '/content/html/document/src',
     '/content/media/webaudio',
@@ -54,6 +53,7 @@ LOCAL_INCLUDES += [
     '/dom/battery',
     '/dom/bluetooth',
     '/dom/camera',
+    '/dom/canvas',
     '/dom/file',
     '/dom/indexedDB',
     '/dom/src/geolocation',

diff --git a/content/canvas/src/CanvasGradient.h → dom/canvas/CanvasGradient.h b/content/canvas/src/CanvasGradient.h → dom/canvas/CanvasGradient.h
diff --git a/content/canvas/src/CanvasImageCache.cpp → dom/canvas/CanvasImageCache.cpp b/content/canvas/src/CanvasImageCache.cpp → dom/canvas/CanvasImageCache.cpp
diff --git a/content/canvas/src/CanvasImageCache.h → dom/canvas/CanvasImageCache.h b/content/canvas/src/CanvasImageCache.h → dom/canvas/CanvasImageCache.h
diff --git a/content/canvas/src/CanvasPattern.h → dom/canvas/CanvasPattern.h b/content/canvas/src/CanvasPattern.h → dom/canvas/CanvasPattern.h
diff --git a/...t/canvas/src/CanvasRenderingContext2D.cpp → dom/canvas/CanvasRenderingContext2D.cpp b/...t/canvas/src/CanvasRenderingContext2D.cpp → dom/canvas/CanvasRenderingContext2D.cpp
diff --git a/...ent/canvas/src/CanvasRenderingContext2D.h → dom/canvas/CanvasRenderingContext2D.h b/...ent/canvas/src/CanvasRenderingContext2D.h → dom/canvas/CanvasRenderingContext2D.h
diff --git a/content/canvas/src/CanvasUtils.cpp → dom/canvas/CanvasUtils.cpp b/content/canvas/src/CanvasUtils.cpp → dom/canvas/CanvasUtils.cpp
diff --git a/content/canvas/src/CanvasUtils.h → dom/canvas/CanvasUtils.h b/content/canvas/src/CanvasUtils.h → dom/canvas/CanvasUtils.h
diff --git a/content/canvas/src/DocumentRendererChild.cpp → dom/canvas/DocumentRendererChild.cpp b/content/canvas/src/DocumentRendererChild.cpp → dom/canvas/DocumentRendererChild.cpp
diff --git a/...ent/canvas/public/DocumentRendererChild.h → dom/canvas/DocumentRendererChild.h b/...ent/canvas/public/DocumentRendererChild.h → dom/canvas/DocumentRendererChild.h
diff --git a/...ent/canvas/src/DocumentRendererParent.cpp → dom/canvas/DocumentRendererParent.cpp b/...ent/canvas/src/DocumentRendererParent.cpp → dom/canvas/DocumentRendererParent.cpp
diff --git a/...nt/canvas/public/DocumentRendererParent.h → dom/canvas/DocumentRendererParent.h b/...nt/canvas/public/DocumentRendererParent.h → dom/canvas/DocumentRendererParent.h
diff --git a/content/canvas/src/ImageData.cpp → dom/canvas/ImageData.cpp b/content/canvas/src/ImageData.cpp → dom/canvas/ImageData.cpp
diff --git a/content/canvas/src/ImageData.h → dom/canvas/ImageData.h b/content/canvas/src/ImageData.h → dom/canvas/ImageData.h
diff --git a/content/canvas/src/ImageEncoder.cpp → dom/canvas/ImageEncoder.cpp b/content/canvas/src/ImageEncoder.cpp → dom/canvas/ImageEncoder.cpp
diff --git a/content/canvas/src/ImageEncoder.h → dom/canvas/ImageEncoder.h b/content/canvas/src/ImageEncoder.h → dom/canvas/ImageEncoder.h
diff --git a/content/canvas/src/Makefile.in → dom/canvas/Makefile.in b/content/canvas/src/Makefile.in → dom/canvas/Makefile.in
diff --git a/content/canvas/src/MurmurHash3.cpp → dom/canvas/MurmurHash3.cpp b/content/canvas/src/MurmurHash3.cpp → dom/canvas/MurmurHash3.cpp
diff --git a/content/canvas/src/MurmurHash3.h → dom/canvas/MurmurHash3.h b/content/canvas/src/MurmurHash3.h → dom/canvas/MurmurHash3.h
diff --git a/content/canvas/src/TextMetrics.h → dom/canvas/TextMetrics.h b/content/canvas/src/TextMetrics.h → dom/canvas/TextMetrics.h
diff --git a/content/canvas/src/WebGL1Context.cpp → dom/canvas/WebGL1Context.cpp b/content/canvas/src/WebGL1Context.cpp → dom/canvas/WebGL1Context.cpp
diff --git a/content/canvas/src/WebGL1Context.h → dom/canvas/WebGL1Context.h b/content/canvas/src/WebGL1Context.h → dom/canvas/WebGL1Context.h
diff --git a/content/canvas/src/WebGL2Context.cpp → dom/canvas/WebGL2Context.cpp b/content/canvas/src/WebGL2Context.cpp → dom/canvas/WebGL2Context.cpp
diff --git a/content/canvas/src/WebGL2Context.h → dom/canvas/WebGL2Context.h b/content/canvas/src/WebGL2Context.h → dom/canvas/WebGL2Context.h
diff --git a/content/canvas/src/WebGLActiveInfo.cpp → dom/canvas/WebGLActiveInfo.cpp b/content/canvas/src/WebGLActiveInfo.cpp → dom/canvas/WebGLActiveInfo.cpp
diff --git a/content/canvas/src/WebGLActiveInfo.h → dom/canvas/WebGLActiveInfo.h b/content/canvas/src/WebGLActiveInfo.h → dom/canvas/WebGLActiveInfo.h
diff --git a/content/canvas/src/WebGLBuffer.cpp → dom/canvas/WebGLBuffer.cpp b/content/canvas/src/WebGLBuffer.cpp → dom/canvas/WebGLBuffer.cpp
diff --git a/content/canvas/src/WebGLBuffer.h → dom/canvas/WebGLBuffer.h b/content/canvas/src/WebGLBuffer.h → dom/canvas/WebGLBuffer.h
diff --git a/content/canvas/src/WebGLContext.cpp → dom/canvas/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp → dom/canvas/WebGLContext.cpp
diff --git a/content/canvas/src/WebGLContext.h → dom/canvas/WebGLContext.h b/content/canvas/src/WebGLContext.h → dom/canvas/WebGLContext.h
diff --git a/...t/canvas/src/WebGLContextAsyncQueries.cpp → dom/canvas/WebGLContextAsyncQueries.cpp b/...t/canvas/src/WebGLContextAsyncQueries.cpp → dom/canvas/WebGLContextAsyncQueries.cpp
diff --git a/content/canvas/src/WebGLContextBuffers.cpp → dom/canvas/WebGLContextBuffers.cpp b/content/canvas/src/WebGLContextBuffers.cpp → dom/canvas/WebGLContextBuffers.cpp
diff --git a/content/canvas/src/WebGLContextDraw.cpp → dom/canvas/WebGLContextDraw.cpp b/content/canvas/src/WebGLContextDraw.cpp → dom/canvas/WebGLContextDraw.cpp
diff --git a/...ent/canvas/src/WebGLContextExtensions.cpp → dom/canvas/WebGLContextExtensions.cpp b/...ent/canvas/src/WebGLContextExtensions.cpp → dom/canvas/WebGLContextExtensions.cpp
diff --git a/...src/WebGLContextFramebufferOperations.cpp → ...vas/WebGLContextFramebufferOperations.cpp b/...src/WebGLContextFramebufferOperations.cpp → ...vas/WebGLContextFramebufferOperations.cpp
diff --git a/content/canvas/src/WebGLContextGL.cpp → dom/canvas/WebGLContextGL.cpp b/content/canvas/src/WebGLContextGL.cpp → dom/canvas/WebGLContextGL.cpp
diff --git a/content/canvas/src/WebGLContextLossTimer.cpp → dom/canvas/WebGLContextLossTimer.cpp b/content/canvas/src/WebGLContextLossTimer.cpp → dom/canvas/WebGLContextLossTimer.cpp
diff --git a/...t/canvas/src/WebGLContextNotSupported.cpp → dom/canvas/WebGLContextNotSupported.cpp b/...t/canvas/src/WebGLContextNotSupported.cpp → dom/canvas/WebGLContextNotSupported.cpp
diff --git a/content/canvas/src/WebGLContextReporter.cpp → dom/canvas/WebGLContextReporter.cpp b/content/canvas/src/WebGLContextReporter.cpp → dom/canvas/WebGLContextReporter.cpp
diff --git a/content/canvas/src/WebGLContextState.cpp → dom/canvas/WebGLContextState.cpp b/content/canvas/src/WebGLContextState.cpp → dom/canvas/WebGLContextState.cpp
diff --git a/content/canvas/src/WebGLContextUtils.cpp → dom/canvas/WebGLContextUtils.cpp b/content/canvas/src/WebGLContextUtils.cpp → dom/canvas/WebGLContextUtils.cpp
diff --git a/content/canvas/src/WebGLContextUtils.h → dom/canvas/WebGLContextUtils.h b/content/canvas/src/WebGLContextUtils.h → dom/canvas/WebGLContextUtils.h
diff --git a/content/canvas/src/WebGLContextValidate.cpp → dom/canvas/WebGLContextValidate.cpp b/content/canvas/src/WebGLContextValidate.cpp → dom/canvas/WebGLContextValidate.cpp
diff --git a/...nt/canvas/src/WebGLContextVertexArray.cpp → dom/canvas/WebGLContextVertexArray.cpp b/...nt/canvas/src/WebGLContextVertexArray.cpp → dom/canvas/WebGLContextVertexArray.cpp
diff --git a/content/canvas/src/WebGLContextVertices.cpp → dom/canvas/WebGLContextVertices.cpp b/content/canvas/src/WebGLContextVertices.cpp → dom/canvas/WebGLContextVertices.cpp
diff --git a/...ent/canvas/src/WebGLElementArrayCache.cpp → dom/canvas/WebGLElementArrayCache.cpp b/...ent/canvas/src/WebGLElementArrayCache.cpp → dom/canvas/WebGLElementArrayCache.cpp
diff --git a/content/canvas/src/WebGLElementArrayCache.h → dom/canvas/WebGLElementArrayCache.h b/content/canvas/src/WebGLElementArrayCache.h → dom/canvas/WebGLElementArrayCache.h
diff --git a/content/canvas/src/WebGLExtensionBase.cpp → dom/canvas/WebGLExtensionBase.cpp b/content/canvas/src/WebGLExtensionBase.cpp → dom/canvas/WebGLExtensionBase.cpp
diff --git a/.../canvas/src/WebGLExtensionBlendMinMax.cpp → dom/canvas/WebGLExtensionBlendMinMax.cpp b/.../canvas/src/WebGLExtensionBlendMinMax.cpp → dom/canvas/WebGLExtensionBlendMinMax.cpp
diff --git a/...as/src/WebGLExtensionColorBufferFloat.cpp → ...canvas/WebGLExtensionColorBufferFloat.cpp b/...as/src/WebGLExtensionColorBufferFloat.cpp → ...canvas/WebGLExtensionColorBufferFloat.cpp
diff --git a/...rc/WebGLExtensionColorBufferHalfFloat.cpp → ...as/WebGLExtensionColorBufferHalfFloat.cpp b/...rc/WebGLExtensionColorBufferHalfFloat.cpp → ...as/WebGLExtensionColorBufferHalfFloat.cpp
diff --git a/...rc/WebGLExtensionCompressedTextureATC.cpp → ...as/WebGLExtensionCompressedTextureATC.cpp b/...rc/WebGLExtensionCompressedTextureATC.cpp → ...as/WebGLExtensionCompressedTextureATC.cpp
diff --git a/...c/WebGLExtensionCompressedTextureETC1.cpp → ...s/WebGLExtensionCompressedTextureETC1.cpp b/...c/WebGLExtensionCompressedTextureETC1.cpp → ...s/WebGLExtensionCompressedTextureETC1.cpp
diff --git a/.../WebGLExtensionCompressedTexturePVRTC.cpp → .../WebGLExtensionCompressedTexturePVRTC.cpp b/.../WebGLExtensionCompressedTexturePVRTC.cpp → .../WebGLExtensionCompressedTexturePVRTC.cpp
diff --git a/...c/WebGLExtensionCompressedTextureS3TC.cpp → ...s/WebGLExtensionCompressedTextureS3TC.cpp b/...c/WebGLExtensionCompressedTextureS3TC.cpp → ...s/WebGLExtensionCompressedTextureS3TC.cpp
diff --git a/...s/src/WebGLExtensionDebugRendererInfo.cpp → ...anvas/WebGLExtensionDebugRendererInfo.cpp b/...s/src/WebGLExtensionDebugRendererInfo.cpp → ...anvas/WebGLExtensionDebugRendererInfo.cpp
diff --git a/...canvas/src/WebGLExtensionDebugShaders.cpp → dom/canvas/WebGLExtensionDebugShaders.cpp b/...canvas/src/WebGLExtensionDebugShaders.cpp → dom/canvas/WebGLExtensionDebugShaders.cpp
diff --git a/...canvas/src/WebGLExtensionDepthTexture.cpp → dom/canvas/WebGLExtensionDepthTexture.cpp b/...canvas/src/WebGLExtensionDepthTexture.cpp → dom/canvas/WebGLExtensionDepthTexture.cpp
diff --git a/.../canvas/src/WebGLExtensionDrawBuffers.cpp → dom/canvas/WebGLExtensionDrawBuffers.cpp b/.../canvas/src/WebGLExtensionDrawBuffers.cpp → dom/canvas/WebGLExtensionDrawBuffers.cpp
diff --git a/...as/src/WebGLExtensionElementIndexUint.cpp → ...canvas/WebGLExtensionElementIndexUint.cpp b/...as/src/WebGLExtensionElementIndexUint.cpp → ...canvas/WebGLExtensionElementIndexUint.cpp
diff --git a/...nt/canvas/src/WebGLExtensionFragDepth.cpp → dom/canvas/WebGLExtensionFragDepth.cpp b/...nt/canvas/src/WebGLExtensionFragDepth.cpp → dom/canvas/WebGLExtensionFragDepth.cpp
diff --git a/...vas/src/WebGLExtensionInstancedArrays.cpp → dom/canvas/WebGLExtensionInstancedArrays.cpp b/...vas/src/WebGLExtensionInstancedArrays.cpp → dom/canvas/WebGLExtensionInstancedArrays.cpp
diff --git a/.../canvas/src/WebGLExtensionLoseContext.cpp → dom/canvas/WebGLExtensionLoseContext.cpp b/.../canvas/src/WebGLExtensionLoseContext.cpp → dom/canvas/WebGLExtensionLoseContext.cpp
diff --git a/content/canvas/src/WebGLExtensionSRGB.cpp → dom/canvas/WebGLExtensionSRGB.cpp b/content/canvas/src/WebGLExtensionSRGB.cpp → dom/canvas/WebGLExtensionSRGB.cpp
diff --git a/...src/WebGLExtensionStandardDerivatives.cpp → ...vas/WebGLExtensionStandardDerivatives.cpp b/...src/WebGLExtensionStandardDerivatives.cpp → ...vas/WebGLExtensionStandardDerivatives.cpp
diff --git a/...ebGLExtensionTextureFilterAnisotropic.cpp → ...ebGLExtensionTextureFilterAnisotropic.cpp b/...ebGLExtensionTextureFilterAnisotropic.cpp → ...ebGLExtensionTextureFilterAnisotropic.cpp
diff --git a/...canvas/src/WebGLExtensionTextureFloat.cpp → dom/canvas/WebGLExtensionTextureFloat.cpp b/...canvas/src/WebGLExtensionTextureFloat.cpp → dom/canvas/WebGLExtensionTextureFloat.cpp
diff --git a/.../src/WebGLExtensionTextureFloatLinear.cpp → ...nvas/WebGLExtensionTextureFloatLinear.cpp b/.../src/WebGLExtensionTextureFloatLinear.cpp → ...nvas/WebGLExtensionTextureFloatLinear.cpp
diff --git a/...as/src/WebGLExtensionTextureHalfFloat.cpp → ...canvas/WebGLExtensionTextureHalfFloat.cpp b/...as/src/WebGLExtensionTextureHalfFloat.cpp → ...canvas/WebGLExtensionTextureHalfFloat.cpp
diff --git a/.../WebGLExtensionTextureHalfFloatLinear.cpp → .../WebGLExtensionTextureHalfFloatLinear.cpp b/.../WebGLExtensionTextureHalfFloatLinear.cpp → .../WebGLExtensionTextureHalfFloatLinear.cpp
diff --git a/.../canvas/src/WebGLExtensionVertexArray.cpp → dom/canvas/WebGLExtensionVertexArray.cpp b/.../canvas/src/WebGLExtensionVertexArray.cpp → dom/canvas/WebGLExtensionVertexArray.cpp
diff --git a/content/canvas/src/WebGLExtensions.h → dom/canvas/WebGLExtensions.h b/content/canvas/src/WebGLExtensions.h → dom/canvas/WebGLExtensions.h
diff --git a/content/canvas/src/WebGLFramebuffer.cpp → dom/canvas/WebGLFramebuffer.cpp b/content/canvas/src/WebGLFramebuffer.cpp → dom/canvas/WebGLFramebuffer.cpp
diff --git a/content/canvas/src/WebGLFramebuffer.h → dom/canvas/WebGLFramebuffer.h b/content/canvas/src/WebGLFramebuffer.h → dom/canvas/WebGLFramebuffer.h
diff --git a/...canvas/src/WebGLFramebufferAttachable.cpp → dom/canvas/WebGLFramebufferAttachable.cpp b/...canvas/src/WebGLFramebufferAttachable.cpp → dom/canvas/WebGLFramebufferAttachable.cpp
diff --git a/...t/canvas/src/WebGLFramebufferAttachable.h → dom/canvas/WebGLFramebufferAttachable.h b/...t/canvas/src/WebGLFramebufferAttachable.h → dom/canvas/WebGLFramebufferAttachable.h
diff --git a/content/canvas/src/WebGLMemoryTracker.h → dom/canvas/WebGLMemoryTracker.h b/content/canvas/src/WebGLMemoryTracker.h → dom/canvas/WebGLMemoryTracker.h
diff --git a/content/canvas/src/WebGLObjectModel.cpp → dom/canvas/WebGLObjectModel.cpp b/content/canvas/src/WebGLObjectModel.cpp → dom/canvas/WebGLObjectModel.cpp
diff --git a/content/canvas/src/WebGLObjectModel.h → dom/canvas/WebGLObjectModel.h b/content/canvas/src/WebGLObjectModel.h → dom/canvas/WebGLObjectModel.h
diff --git a/content/canvas/src/WebGLProgram.cpp → dom/canvas/WebGLProgram.cpp b/content/canvas/src/WebGLProgram.cpp → dom/canvas/WebGLProgram.cpp
diff --git a/content/canvas/src/WebGLProgram.h → dom/canvas/WebGLProgram.h b/content/canvas/src/WebGLProgram.h → dom/canvas/WebGLProgram.h
diff --git a/content/canvas/src/WebGLQuery.cpp → dom/canvas/WebGLQuery.cpp b/content/canvas/src/WebGLQuery.cpp → dom/canvas/WebGLQuery.cpp
diff --git a/content/canvas/src/WebGLQuery.h → dom/canvas/WebGLQuery.h b/content/canvas/src/WebGLQuery.h → dom/canvas/WebGLQuery.h
diff --git a/content/canvas/src/WebGLRenderbuffer.cpp → dom/canvas/WebGLRenderbuffer.cpp b/content/canvas/src/WebGLRenderbuffer.cpp → dom/canvas/WebGLRenderbuffer.cpp
diff --git a/content/canvas/src/WebGLRenderbuffer.h → dom/canvas/WebGLRenderbuffer.h b/content/canvas/src/WebGLRenderbuffer.h → dom/canvas/WebGLRenderbuffer.h
diff --git a/content/canvas/src/WebGLShader.cpp → dom/canvas/WebGLShader.cpp b/content/canvas/src/WebGLShader.cpp → dom/canvas/WebGLShader.cpp
diff --git a/content/canvas/src/WebGLShader.h → dom/canvas/WebGLShader.h b/content/canvas/src/WebGLShader.h → dom/canvas/WebGLShader.h
diff --git a/...canvas/src/WebGLShaderPrecisionFormat.cpp → dom/canvas/WebGLShaderPrecisionFormat.cpp b/...canvas/src/WebGLShaderPrecisionFormat.cpp → dom/canvas/WebGLShaderPrecisionFormat.cpp
diff --git a/...t/canvas/src/WebGLShaderPrecisionFormat.h → dom/canvas/WebGLShaderPrecisionFormat.h b/...t/canvas/src/WebGLShaderPrecisionFormat.h → dom/canvas/WebGLShaderPrecisionFormat.h
diff --git a/content/canvas/src/WebGLTexelConversions.cpp → dom/canvas/WebGLTexelConversions.cpp b/content/canvas/src/WebGLTexelConversions.cpp → dom/canvas/WebGLTexelConversions.cpp
diff --git a/content/canvas/src/WebGLTexelConversions.h → dom/canvas/WebGLTexelConversions.h b/content/canvas/src/WebGLTexelConversions.h → dom/canvas/WebGLTexelConversions.h
diff --git a/content/canvas/src/WebGLTexture.cpp → dom/canvas/WebGLTexture.cpp b/content/canvas/src/WebGLTexture.cpp → dom/canvas/WebGLTexture.cpp
diff --git a/content/canvas/src/WebGLTexture.h → dom/canvas/WebGLTexture.h b/content/canvas/src/WebGLTexture.h → dom/canvas/WebGLTexture.h
diff --git a/content/canvas/src/WebGLTypes.h → dom/canvas/WebGLTypes.h b/content/canvas/src/WebGLTypes.h → dom/canvas/WebGLTypes.h
diff --git a/content/canvas/src/WebGLUniformInfo.h → dom/canvas/WebGLUniformInfo.h b/content/canvas/src/WebGLUniformInfo.h → dom/canvas/WebGLUniformInfo.h
diff --git a/content/canvas/src/WebGLUniformLocation.cpp → dom/canvas/WebGLUniformLocation.cpp b/content/canvas/src/WebGLUniformLocation.cpp → dom/canvas/WebGLUniformLocation.cpp
diff --git a/content/canvas/src/WebGLUniformLocation.h → dom/canvas/WebGLUniformLocation.h b/content/canvas/src/WebGLUniformLocation.h → dom/canvas/WebGLUniformLocation.h
diff --git a/content/canvas/src/WebGLValidateStrings.h → dom/canvas/WebGLValidateStrings.h b/content/canvas/src/WebGLValidateStrings.h → dom/canvas/WebGLValidateStrings.h
diff --git a/content/canvas/src/WebGLVertexArray.cpp → dom/canvas/WebGLVertexArray.cpp b/content/canvas/src/WebGLVertexArray.cpp → dom/canvas/WebGLVertexArray.cpp
diff --git a/content/canvas/src/WebGLVertexArray.h → dom/canvas/WebGLVertexArray.h b/content/canvas/src/WebGLVertexArray.h → dom/canvas/WebGLVertexArray.h
diff --git a/content/canvas/src/WebGLVertexArrayFake.cpp → dom/canvas/WebGLVertexArrayFake.cpp b/content/canvas/src/WebGLVertexArrayFake.cpp → dom/canvas/WebGLVertexArrayFake.cpp
diff --git a/content/canvas/src/WebGLVertexArrayFake.h → dom/canvas/WebGLVertexArrayFake.h b/content/canvas/src/WebGLVertexArrayFake.h → dom/canvas/WebGLVertexArrayFake.h
diff --git a/content/canvas/src/WebGLVertexArrayGL.cpp → dom/canvas/WebGLVertexArrayGL.cpp b/content/canvas/src/WebGLVertexArrayGL.cpp → dom/canvas/WebGLVertexArrayGL.cpp
diff --git a/content/canvas/src/WebGLVertexArrayGL.h → dom/canvas/WebGLVertexArrayGL.h b/content/canvas/src/WebGLVertexArrayGL.h → dom/canvas/WebGLVertexArrayGL.h
diff --git a/content/canvas/src/WebGLVertexAttribData.h → dom/canvas/WebGLVertexAttribData.h b/content/canvas/src/WebGLVertexAttribData.h → dom/canvas/WebGLVertexAttribData.h
diff --git a/...mpiledtest/TestWebGLElementArrayCache.cpp → ...mpiledtest/TestWebGLElementArrayCache.cpp b/...mpiledtest/TestWebGLElementArrayCache.cpp → ...mpiledtest/TestWebGLElementArrayCache.cpp
diff --git a/content/canvas/compiledtest/moz.build → dom/canvas/compiledtest/moz.build b/content/canvas/compiledtest/moz.build → dom/canvas/compiledtest/moz.build
@@ -13,7 +13,7 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
-    '../src',
+    '../',
 ]
 
 USE_LIBS += [

diff --git a/...nvas/crashtests/0px-size-font-667225.html → ...nvas/crashtests/0px-size-font-667225.html b/...nvas/crashtests/0px-size-font-667225.html → ...nvas/crashtests/0px-size-font-667225.html
diff --git a/...nvas/crashtests/0px-size-font-shadow.html → ...nvas/crashtests/0px-size-font-shadow.html b/...nvas/crashtests/0px-size-font-shadow.html → ...nvas/crashtests/0px-size-font-shadow.html
diff --git a/content/canvas/crashtests/360293-1.html → dom/canvas/crashtests/360293-1.html b/content/canvas/crashtests/360293-1.html → dom/canvas/crashtests/360293-1.html
diff --git a/content/canvas/crashtests/421715-1.html → dom/canvas/crashtests/421715-1.html b/content/canvas/crashtests/421715-1.html → dom/canvas/crashtests/421715-1.html
diff --git a/content/canvas/crashtests/553938-1.html → dom/canvas/crashtests/553938-1.html b/content/canvas/crashtests/553938-1.html → dom/canvas/crashtests/553938-1.html
diff --git a/content/canvas/crashtests/647480.html → dom/canvas/crashtests/647480.html b/content/canvas/crashtests/647480.html → dom/canvas/crashtests/647480.html
diff --git a/content/canvas/crashtests/727547.html → dom/canvas/crashtests/727547.html b/content/canvas/crashtests/727547.html → dom/canvas/crashtests/727547.html
diff --git a/content/canvas/crashtests/729116.html → dom/canvas/crashtests/729116.html b/content/canvas/crashtests/729116.html → dom/canvas/crashtests/729116.html
diff --git a/...nvas/crashtests/743499-negative-size.html → ...nvas/crashtests/743499-negative-size.html b/...nvas/crashtests/743499-negative-size.html → ...nvas/crashtests/743499-negative-size.html
diff --git a/content/canvas/crashtests/745699-1.html → dom/canvas/crashtests/745699-1.html b/content/canvas/crashtests/745699-1.html → dom/canvas/crashtests/745699-1.html
diff --git a/...anvas/crashtests/745818-large-source.html → ...anvas/crashtests/745818-large-source.html b/...anvas/crashtests/745818-large-source.html → ...anvas/crashtests/745818-large-source.html
diff --git a/content/canvas/crashtests/746813-1.html → dom/canvas/crashtests/746813-1.html b/content/canvas/crashtests/746813-1.html → dom/canvas/crashtests/746813-1.html
diff --git a/content/canvas/crashtests/767337-1.html → dom/canvas/crashtests/767337-1.html b/content/canvas/crashtests/767337-1.html → dom/canvas/crashtests/767337-1.html
diff --git a/content/canvas/crashtests/780392-1.html → dom/canvas/crashtests/780392-1.html b/content/canvas/crashtests/780392-1.html → dom/canvas/crashtests/780392-1.html
diff --git a/content/canvas/crashtests/789933-1.html → dom/canvas/crashtests/789933-1.html b/content/canvas/crashtests/789933-1.html → dom/canvas/crashtests/789933-1.html
diff --git a/content/canvas/crashtests/794463-1.html → dom/canvas/crashtests/794463-1.html b/content/canvas/crashtests/794463-1.html → dom/canvas/crashtests/794463-1.html
diff --git a/content/canvas/crashtests/802926-1.html → dom/canvas/crashtests/802926-1.html b/content/canvas/crashtests/802926-1.html → dom/canvas/crashtests/802926-1.html
diff --git a/content/canvas/crashtests/896047-1.html → dom/canvas/crashtests/896047-1.html b/content/canvas/crashtests/896047-1.html → dom/canvas/crashtests/896047-1.html
diff --git a/content/canvas/crashtests/896047-2.html → dom/canvas/crashtests/896047-2.html b/content/canvas/crashtests/896047-2.html → dom/canvas/crashtests/896047-2.html
diff --git a/content/canvas/crashtests/916128-1.html → dom/canvas/crashtests/916128-1.html b/content/canvas/crashtests/916128-1.html → dom/canvas/crashtests/916128-1.html
diff --git a/content/canvas/crashtests/934939-1.html → dom/canvas/crashtests/934939-1.html b/content/canvas/crashtests/934939-1.html → dom/canvas/crashtests/934939-1.html
diff --git a/content/canvas/crashtests/crashtests.list → dom/canvas/crashtests/crashtests.list b/content/canvas/crashtests/crashtests.list → dom/canvas/crashtests/crashtests.list
diff --git a/content/canvas/crashtests/texImage2D.html → dom/canvas/crashtests/texImage2D.html b/content/canvas/crashtests/texImage2D.html → dom/canvas/crashtests/texImage2D.html
diff --git a/content/canvas/src/moz.build → dom/canvas/moz.build b/content/canvas/src/moz.build → dom/canvas/moz.build
@@ -4,6 +4,18 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+TEST_DIRS += ['test']
+TEST_TOOL_DIRS += ['compiledtest']
+
+EXPORTS += [
+    'nsICanvasRenderingContextInternal.h',
+]
+
+EXPORTS.mozilla.ipc += [
+    'DocumentRendererChild.h',
+    'DocumentRendererParent.h',
+]
+
 EXPORTS.mozilla.dom += [
     'CanvasGradient.h',
     'CanvasPattern.h',

diff --git a/...ublic/nsICanvasRenderingContextInternal.h → ...anvas/nsICanvasRenderingContextInternal.h b/...ublic/nsICanvasRenderingContextInternal.h → ...anvas/nsICanvasRenderingContextInternal.h
diff --git a/dom/canvas/test/android.json b/dom/canvas/test/android.json
@@ -0,0 +1,6 @@
+{
+  "runtests": {},
+  "excludetests": {
+      "dom/canvas/test/webgl/test_webgl_conformance_test_suite.html": ""
+  }
+}
diff --git a/content/canvas/test/chrome/chrome.ini → dom/canvas/test/chrome/chrome.ini b/content/canvas/test/chrome/chrome.ini → dom/canvas/test/chrome/chrome.ini
diff --git a/.../nonchrome_webgl_debug_renderer_info.html → .../nonchrome_webgl_debug_renderer_info.html b/.../nonchrome_webgl_debug_renderer_info.html → .../nonchrome_webgl_debug_renderer_info.html
diff --git a/...chrome/test_drawWindow_widget_layers.html → ...chrome/test_drawWindow_widget_layers.html b/...chrome/test_drawWindow_widget_layers.html → ...chrome/test_drawWindow_widget_layers.html
diff --git a/...hrome/test_webgl_debug_renderer_info.html → ...hrome/test_webgl_debug_renderer_info.html b/...hrome/test_webgl_debug_renderer_info.html → ...hrome/test_webgl_debug_renderer_info.html
@@ -67,7 +67,7 @@
   // Now run the non-chrome code to verify the security of this WebGL chrome-only extension.
 
   var iframe = document.createElement("iframe");
-  iframe.src = "http://mochi.test:8888/chrome/content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html";
+  iframe.src = "http://mochi.test:8888/chrome/dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html";
 
   iframe.onload = function () {
 

diff --git a/...t/crossorigin/image-allow-credentials.png → ...t/crossorigin/image-allow-credentials.png b/...t/crossorigin/image-allow-credentials.png → ...t/crossorigin/image-allow-credentials.png
diff --git a/...igin/image-allow-credentials.png^headers^ → ...igin/image-allow-credentials.png^headers^ b/...igin/image-allow-credentials.png^headers^ → ...igin/image-allow-credentials.png^headers^
diff --git a/...vas/test/crossorigin/image-allow-star.png → ...vas/test/crossorigin/image-allow-star.png b/...vas/test/crossorigin/image-allow-star.png → ...vas/test/crossorigin/image-allow-star.png
diff --git a/...crossorigin/image-allow-star.png^headers^ → ...crossorigin/image-allow-star.png^headers^ b/...crossorigin/image-allow-star.png^headers^ → ...crossorigin/image-allow-star.png^headers^
diff --git a/content/canvas/test/crossorigin/image.png → dom/canvas/test/crossorigin/image.png b/content/canvas/test/crossorigin/image.png → dom/canvas/test/crossorigin/image.png
diff --git a/...ent/canvas/test/crossorigin/mochitest.ini → dom/canvas/test/crossorigin/mochitest.ini b/...ent/canvas/test/crossorigin/mochitest.ini → dom/canvas/test/crossorigin/mochitest.ini
diff --git a/...rossorigin/test_canvas2d_crossorigin.html → ...rossorigin/test_canvas2d_crossorigin.html b/...rossorigin/test_canvas2d_crossorigin.html → ...rossorigin/test_canvas2d_crossorigin.html
@@ -106,7 +106,7 @@
 }
 
 // Now kick off the tests.
-const testPath = "/tests/content/canvas/test/crossorigin/"
+const testPath = "/tests/dom/canvas/test/crossorigin/"
 
 // First column is image file, second column is what CORS headers the server sends
 const imageFiles = [

diff --git a/...t/crossorigin/test_video_crossorigin.html → ...t/crossorigin/test_video_crossorigin.html b/...t/crossorigin/test_video_crossorigin.html → ...t/crossorigin/test_video_crossorigin.html
@@ -158,7 +158,7 @@
 var manager = new MediaTestManager;
 var corsTests = [];
 
-const host = "http://example.com/tests/content/canvas/test/crossorigin/video.sjs";
+const host = "http://example.com/tests/dom/canvas/test/crossorigin/video.sjs";
 const serverAttrValues = [
   [ "&cors=none", "none" ],
   [ "&cors=anonymous", "anonymous" ],

diff --git a/...igin/test_webgl_crossorigin_textures.html → ...igin/test_webgl_crossorigin_textures.html b/...igin/test_webgl_crossorigin_textures.html → ...igin/test_webgl_crossorigin_textures.html
@@ -73,68 +73,68 @@
     }
 
 
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 "SecurityError");
 
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "use-credentials",
                 "SecurityError");
 
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "missing-value-default",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "use-credentials",
                 OK);
 
     // Test that bad values for crossorigin="..." are interpreted as invalid-value-default which is "anonymous".
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/dom/canvas/test/crossorigin/image.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image.png",
                 "foobar",
                 "SecurityError");
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-star.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/dom/canvas/test/crossorigin/image-allow-credentials.png",
                 "foobar",
                 OK);
 

diff --git a/content/canvas/test/crossorigin/video.sjs → dom/canvas/test/crossorigin/video.sjs b/content/canvas/test/crossorigin/video.sjs → dom/canvas/test/crossorigin/video.sjs
diff --git a/.../test/file_drawImage_document_domain.html → .../test/file_drawImage_document_domain.html b/.../test/file_drawImage_document_domain.html → .../test/file_drawImage_document_domain.html
diff --git a/...ent/canvas/test/file_drawWindow_common.js → dom/canvas/test/file_drawWindow_common.js b/...ent/canvas/test/file_drawWindow_common.js → dom/canvas/test/file_drawWindow_common.js
diff --git a/...t/canvas/test/file_drawWindow_source.html → dom/canvas/test/file_drawWindow_source.html b/...t/canvas/test/file_drawWindow_source.html → dom/canvas/test/file_drawWindow_source.html
diff --git a/content/canvas/test/image_anim-gr.gif → dom/canvas/test/image_anim-gr.gif b/content/canvas/test/image_anim-gr.gif → dom/canvas/test/image_anim-gr.gif
diff --git a/content/canvas/test/image_anim-gr.png → dom/canvas/test/image_anim-gr.png b/content/canvas/test/image_anim-gr.png → dom/canvas/test/image_anim-gr.png
diff --git a/content/canvas/test/image_anim-poster-gr.png → dom/canvas/test/image_anim-poster-gr.png b/content/canvas/test/image_anim-poster-gr.png → dom/canvas/test/image_anim-poster-gr.png
diff --git a/content/canvas/test/image_broken.png → dom/canvas/test/image_broken.png b/content/canvas/test/image_broken.png → dom/canvas/test/image_broken.png
diff --git a/content/canvas/test/image_ggrr-256x256.png → dom/canvas/test/image_ggrr-256x256.png b/content/canvas/test/image_ggrr-256x256.png → dom/canvas/test/image_ggrr-256x256.png
diff --git a/content/canvas/test/image_green-16x16.png → dom/canvas/test/image_green-16x16.png b/content/canvas/test/image_green-16x16.png → dom/canvas/test/image_green-16x16.png
diff --git a/content/canvas/test/image_green-1x1.png → dom/canvas/test/image_green-1x1.png b/content/canvas/test/image_green-1x1.png → dom/canvas/test/image_green-1x1.png
diff --git a/content/canvas/test/image_green-redirect → dom/canvas/test/image_green-redirect b/content/canvas/test/image_green-redirect → dom/canvas/test/image_green-redirect
diff --git a/dom/canvas/test/image_green-redirect^headers^ b/dom/canvas/test/image_green-redirect^headers^
@@ -0,0 +1,2 @@
+HTTP 302 Moved
+Location: http://example.com/tests/dom/canvas/test/image_green-1x1.png
diff --git a/content/canvas/test/image_green.png → dom/canvas/test/image_green.png b/content/canvas/test/image_green.png → dom/canvas/test/image_green.png
diff --git a/content/canvas/test/image_red-16x16.png → dom/canvas/test/image_red-16x16.png b/content/canvas/test/image_red-16x16.png → dom/canvas/test/image_red-16x16.png
diff --git a/content/canvas/test/image_red.png → dom/canvas/test/image_red.png b/content/canvas/test/image_red.png → dom/canvas/test/image_red.png
diff --git a/content/canvas/test/image_redtransparent.png → dom/canvas/test/image_redtransparent.png b/content/canvas/test/image_redtransparent.png → dom/canvas/test/image_redtransparent.png
diff --git a/content/canvas/test/image_rgrg-256x256.png → dom/canvas/test/image_rgrg-256x256.png b/content/canvas/test/image_rgrg-256x256.png → dom/canvas/test/image_rgrg-256x256.png
diff --git a/content/canvas/test/image_rrgg-256x256.png → dom/canvas/test/image_rrgg-256x256.png b/content/canvas/test/image_rrgg-256x256.png → dom/canvas/test/image_rrgg-256x256.png
diff --git a/content/canvas/test/image_transparent.png → dom/canvas/test/image_transparent.png b/content/canvas/test/image_transparent.png → dom/canvas/test/image_transparent.png
diff --git a/content/canvas/test/image_transparent50.png → dom/canvas/test/image_transparent50.png b/content/canvas/test/image_transparent50.png → dom/canvas/test/image_transparent50.png
diff --git a/content/canvas/test/image_yellow.png → dom/canvas/test/image_yellow.png b/content/canvas/test/image_yellow.png → dom/canvas/test/image_yellow.png
diff --git a/content/canvas/test/image_yellow75.png → dom/canvas/test/image_yellow75.png b/content/canvas/test/image_yellow75.png → dom/canvas/test/image_yellow75.png
diff --git a/content/canvas/test/mochitest.ini → dom/canvas/test/mochitest.ini b/content/canvas/test/mochitest.ini → dom/canvas/test/mochitest.ini
diff --git a/content/canvas/test/moz.build → dom/canvas/test/moz.build b/content/canvas/test/moz.build → dom/canvas/test/moz.build
diff --git a/content/canvas/test/reftest/black.html → dom/canvas/test/reftest/black.html b/content/canvas/test/reftest/black.html → dom/canvas/test/reftest/black.html
diff --git a/...t/reftest/clip-multiple-paths-badref.html → ...t/reftest/clip-multiple-paths-badref.html b/...t/reftest/clip-multiple-paths-badref.html → ...t/reftest/clip-multiple-paths-badref.html
diff --git a/...vas/test/reftest/clip-multiple-paths.html → ...vas/test/reftest/clip-multiple-paths.html b/...vas/test/reftest/clip-multiple-paths.html → ...vas/test/reftest/clip-multiple-paths.html
diff --git a/...canvas/test/reftest/colors-half-alpha.png → ...canvas/test/reftest/colors-half-alpha.png b/...canvas/test/reftest/colors-half-alpha.png → ...canvas/test/reftest/colors-half-alpha.png
diff --git a/content/canvas/test/reftest/colors.png → dom/canvas/test/reftest/colors.png b/content/canvas/test/reftest/colors.png → dom/canvas/test/reftest/colors.png
diff --git a/...test/reftest/drawCustomFocusRing-ref.html → ...test/reftest/drawCustomFocusRing-ref.html b/...test/reftest/drawCustomFocusRing-ref.html → ...test/reftest/drawCustomFocusRing-ref.html
diff --git a/...vas/test/reftest/drawCustomFocusRing.html → ...vas/test/reftest/drawCustomFocusRing.html b/...vas/test/reftest/drawCustomFocusRing.html → ...vas/test/reftest/drawCustomFocusRing.html
diff --git a/...s/test/reftest/drawFocusIfNeeded-ref.html → ...s/test/reftest/drawFocusIfNeeded-ref.html b/...s/test/reftest/drawFocusIfNeeded-ref.html → ...s/test/reftest/drawFocusIfNeeded-ref.html
diff --git a/...anvas/test/reftest/drawFocusIfNeeded.html → ...anvas/test/reftest/drawFocusIfNeeded.html b/...anvas/test/reftest/drawFocusIfNeeded.html → ...anvas/test/reftest/drawFocusIfNeeded.html
diff --git a/content/canvas/test/reftest/green.png → dom/canvas/test/reftest/green.png b/content/canvas/test/reftest/green.png → dom/canvas/test/reftest/green.png
diff --git a/...s/test/reftest/half-colors-half-alpha.png → ...s/test/reftest/half-colors-half-alpha.png b/...s/test/reftest/half-colors-half-alpha.png → ...s/test/reftest/half-colors-half-alpha.png
diff --git a/content/canvas/test/reftest/half-colors.png → dom/canvas/test/reftest/half-colors.png b/content/canvas/test/reftest/half-colors.png → dom/canvas/test/reftest/half-colors.png
diff --git a/content/canvas/test/reftest/reftest.list → dom/canvas/test/reftest/reftest.list b/content/canvas/test/reftest/reftest.list → dom/canvas/test/reftest/reftest.list
diff --git a/...s/test/reftest/stroketext-shadow-ref.html → ...s/test/reftest/stroketext-shadow-ref.html b/...s/test/reftest/stroketext-shadow-ref.html → ...s/test/reftest/stroketext-shadow-ref.html
diff --git a/...anvas/test/reftest/stroketext-shadow.html → ...anvas/test/reftest/stroketext-shadow.html b/...anvas/test/reftest/stroketext-shadow.html → ...anvas/test/reftest/stroketext-shadow.html
diff --git a/...canvas/test/reftest/webgl-clear-test.html → ...canvas/test/reftest/webgl-clear-test.html b/...canvas/test/reftest/webgl-clear-test.html → ...canvas/test/reftest/webgl-clear-test.html
diff --git a/.../test/reftest/webgl-color-alpha-test.html → .../test/reftest/webgl-color-alpha-test.html b/.../test/reftest/webgl-color-alpha-test.html → .../test/reftest/webgl-color-alpha-test.html
diff --git a/...canvas/test/reftest/webgl-color-test.html → ...canvas/test/reftest/webgl-color-test.html b/...canvas/test/reftest/webgl-color-test.html → ...canvas/test/reftest/webgl-color-test.html
diff --git a/...nvas/test/reftest/webgl-disable-test.html → ...nvas/test/reftest/webgl-disable-test.html b/...nvas/test/reftest/webgl-disable-test.html → ...nvas/test/reftest/webgl-disable-test.html
diff --git a/...s/test/reftest/webgl-hanging-fb-test.html → ...s/test/reftest/webgl-hanging-fb-test.html b/...s/test/reftest/webgl-hanging-fb-test.html → ...s/test/reftest/webgl-hanging-fb-test.html
diff --git a/...t/reftest/webgl-hanging-scissor-test.html → ...t/reftest/webgl-hanging-scissor-test.html b/...t/reftest/webgl-hanging-scissor-test.html → ...t/reftest/webgl-hanging-scissor-test.html
diff --git a/.../test/reftest/webgl-orientation-test.html → .../test/reftest/webgl-orientation-test.html b/.../test/reftest/webgl-orientation-test.html → .../test/reftest/webgl-orientation-test.html
diff --git a/...anvas/test/reftest/webgl-resize-test.html → ...anvas/test/reftest/webgl-resize-test.html b/...anvas/test/reftest/webgl-resize-test.html → ...anvas/test/reftest/webgl-resize-test.html
diff --git a/content/canvas/test/reftest/webgl-utils.js → dom/canvas/test/reftest/webgl-utils.js b/content/canvas/test/reftest/webgl-utils.js → dom/canvas/test/reftest/webgl-utils.js
diff --git a/...nt/canvas/test/reftest/white-top-left.png → dom/canvas/test/reftest/white-top-left.png b/...nt/canvas/test/reftest/white-top-left.png → dom/canvas/test/reftest/white-top-left.png
diff --git a/content/canvas/test/reftest/white.png → dom/canvas/test/reftest/white.png b/content/canvas/test/reftest/white.png → dom/canvas/test/reftest/white.png
diff --git a/content/canvas/test/reftest/wrapper.html → dom/canvas/test/reftest/wrapper.html b/content/canvas/test/reftest/wrapper.html → dom/canvas/test/reftest/wrapper.html
diff --git a/...st/test_2d.clearRect.image.offscreen.html → ...st/test_2d.clearRect.image.offscreen.html b/...st/test_2d.clearRect.image.offscreen.html → ...st/test_2d.clearRect.image.offscreen.html
diff --git a/...ent/canvas/test/test_2d.clip.winding.html → dom/canvas/test/test_2d.clip.winding.html b/...ent/canvas/test/test_2d.clip.winding.html → dom/canvas/test/test_2d.clip.winding.html
diff --git a/.../test_2d.composite.canvas.color-burn.html → .../test_2d.composite.canvas.color-burn.html b/.../test_2d.composite.canvas.color-burn.html → .../test_2d.composite.canvas.color-burn.html
diff --git a/...test_2d.composite.canvas.color-dodge.html → ...test_2d.composite.canvas.color-dodge.html b/...test_2d.composite.canvas.color-dodge.html → ...test_2d.composite.canvas.color-dodge.html
diff --git a/.../test/test_2d.composite.canvas.color.html → .../test/test_2d.composite.canvas.color.html b/.../test/test_2d.composite.canvas.color.html → .../test/test_2d.composite.canvas.color.html
diff --git a/...test/test_2d.composite.canvas.darken.html → ...test/test_2d.composite.canvas.darken.html b/...test/test_2d.composite.canvas.darken.html → ...test/test_2d.composite.canvas.darken.html
diff --git a/...2d.composite.canvas.destination-atop.html → ...2d.composite.canvas.destination-atop.html b/...2d.composite.canvas.destination-atop.html → ...2d.composite.canvas.destination-atop.html
diff --git a/...t_2d.composite.canvas.destination-in.html → ...t_2d.composite.canvas.destination-in.html b/...t_2d.composite.canvas.destination-in.html → ...t_2d.composite.canvas.destination-in.html
diff --git a/.../test_2d.composite.canvas.difference.html → .../test_2d.composite.canvas.difference.html b/.../test_2d.composite.canvas.difference.html → .../test_2d.composite.canvas.difference.html
diff --git a/...t/test_2d.composite.canvas.exclusion.html → ...t/test_2d.composite.canvas.exclusion.html b/...t/test_2d.composite.canvas.exclusion.html → ...t/test_2d.composite.canvas.exclusion.html
diff --git a/.../test_2d.composite.canvas.hard-light.html → .../test_2d.composite.canvas.hard-light.html b/.../test_2d.composite.canvas.hard-light.html → .../test_2d.composite.canvas.hard-light.html
diff --git a/...as/test/test_2d.composite.canvas.hue.html → ...as/test/test_2d.composite.canvas.hue.html b/...as/test/test_2d.composite.canvas.hue.html → ...as/test/test_2d.composite.canvas.hue.html
diff --git a/...est/test_2d.composite.canvas.lighten.html → ...est/test_2d.composite.canvas.lighten.html b/...est/test_2d.composite.canvas.lighten.html → ...est/test_2d.composite.canvas.lighten.html
diff --git a/...est/test_2d.composite.canvas.lighter.html → ...est/test_2d.composite.canvas.lighter.html b/...est/test_2d.composite.canvas.lighter.html → ...est/test_2d.composite.canvas.lighter.html
diff --git a/.../test_2d.composite.canvas.luminosity.html → .../test_2d.composite.canvas.luminosity.html b/.../test_2d.composite.canvas.luminosity.html → .../test_2d.composite.canvas.luminosity.html
diff --git a/...st/test_2d.composite.canvas.multiply.html → ...st/test_2d.composite.canvas.multiply.html b/...st/test_2d.composite.canvas.multiply.html → ...st/test_2d.composite.canvas.multiply.html
diff --git a/...est/test_2d.composite.canvas.overlay.html → ...est/test_2d.composite.canvas.overlay.html b/...est/test_2d.composite.canvas.overlay.html → ...est/test_2d.composite.canvas.overlay.html
diff --git a/.../test_2d.composite.canvas.saturation.html → .../test_2d.composite.canvas.saturation.html b/.../test_2d.composite.canvas.saturation.html → .../test_2d.composite.canvas.saturation.html
diff --git a/...test/test_2d.composite.canvas.screen.html → ...test/test_2d.composite.canvas.screen.html b/...test/test_2d.composite.canvas.screen.html → ...test/test_2d.composite.canvas.screen.html
diff --git a/.../test_2d.composite.canvas.soft-light.html → .../test_2d.composite.canvas.soft-light.html b/.../test_2d.composite.canvas.soft-light.html → .../test_2d.composite.canvas.soft-light.html
diff --git a/...t/test_2d.composite.canvas.source-in.html → ...t/test_2d.composite.canvas.source-in.html b/...t/test_2d.composite.canvas.source-in.html → ...t/test_2d.composite.canvas.source-in.html
diff --git a/.../test_2d.composite.canvas.source-out.html → .../test_2d.composite.canvas.source-out.html b/.../test_2d.composite.canvas.source-out.html → .../test_2d.composite.canvas.source-out.html
diff --git a/...as/test/test_2d.composite.canvas.xor.html → ...as/test/test_2d.composite.canvas.xor.html b/...as/test/test_2d.composite.canvas.xor.html → ...as/test/test_2d.composite.canvas.xor.html
diff --git a/.../test/test_2d.composite.clip.lighter.html → .../test/test_2d.composite.clip.lighter.html b/.../test/test_2d.composite.clip.lighter.html → .../test/test_2d.composite.clip.lighter.html
diff --git a/...nvas/test/test_2d.composite.clip.xor.html → ...nvas/test/test_2d.composite.clip.xor.html b/...nvas/test/test_2d.composite.clip.xor.html → ...nvas/test/test_2d.composite.clip.xor.html
diff --git a/..._2d.composite.image.destination-atop.html → ..._2d.composite.image.destination-atop.html b/..._2d.composite.image.destination-atop.html → ..._2d.composite.image.destination-atop.html
diff --git a/...st_2d.composite.image.destination-in.html → ...st_2d.composite.image.destination-in.html b/...st_2d.composite.image.destination-in.html → ...st_2d.composite.image.destination-in.html
diff --git a/...test/test_2d.composite.image.lighter.html → ...test/test_2d.composite.image.lighter.html b/...test/test_2d.composite.image.lighter.html → ...test/test_2d.composite.image.lighter.html
diff --git a/...st/test_2d.composite.image.source-in.html → ...st/test_2d.composite.image.source-in.html b/...st/test_2d.composite.image.source-in.html → ...st/test_2d.composite.image.source-in.html
diff --git a/...t/test_2d.composite.image.source-out.html → ...t/test_2d.composite.image.source-out.html b/...t/test_2d.composite.image.source-out.html → ...t/test_2d.composite.image.source-out.html
diff --git a/...vas/test/test_2d.composite.image.xor.html → ...vas/test/test_2d.composite.image.xor.html b/...vas/test/test_2d.composite.image.xor.html → ...vas/test/test_2d.composite.image.xor.html
diff --git a/...t/test_2d.composite.solid.color-burn.html → ...t/test_2d.composite.solid.color-burn.html b/...t/test_2d.composite.solid.color-burn.html → ...t/test_2d.composite.solid.color-burn.html
diff --git a/.../test_2d.composite.solid.color-dodge.html → .../test_2d.composite.solid.color-dodge.html b/.../test_2d.composite.solid.color-dodge.html → .../test_2d.composite.solid.color-dodge.html
diff --git a/...s/test/test_2d.composite.solid.color.html → ...s/test/test_2d.composite.solid.color.html b/...s/test/test_2d.composite.solid.color.html → ...s/test/test_2d.composite.solid.color.html
diff --git a/.../test/test_2d.composite.solid.darken.html → .../test/test_2d.composite.solid.darken.html b/.../test/test_2d.composite.solid.darken.html → .../test/test_2d.composite.solid.darken.html
diff --git a/...t/test_2d.composite.solid.difference.html → ...t/test_2d.composite.solid.difference.html b/...t/test_2d.composite.solid.difference.html → ...t/test_2d.composite.solid.difference.html
diff --git a/...st/test_2d.composite.solid.exclusion.html → ...st/test_2d.composite.solid.exclusion.html b/...st/test_2d.composite.solid.exclusion.html → ...st/test_2d.composite.solid.exclusion.html
diff --git a/...t/test_2d.composite.solid.hard-light.html → ...t/test_2d.composite.solid.hard-light.html b/...t/test_2d.composite.solid.hard-light.html → ...t/test_2d.composite.solid.hard-light.html
diff --git a/...vas/test/test_2d.composite.solid.hue.html → ...vas/test/test_2d.composite.solid.hue.html b/...vas/test/test_2d.composite.solid.hue.html → ...vas/test/test_2d.composite.solid.hue.html
diff --git a/...test/test_2d.composite.solid.lighten.html → ...test/test_2d.composite.solid.lighten.html b/...test/test_2d.composite.solid.lighten.html → ...test/test_2d.composite.solid.lighten.html
diff --git a/...test/test_2d.composite.solid.lighter.html → ...test/test_2d.composite.solid.lighter.html b/...test/test_2d.composite.solid.lighter.html → ...test/test_2d.composite.solid.lighter.html
diff --git a/...t/test_2d.composite.solid.luminosity.html → ...t/test_2d.composite.solid.luminosity.html b/...t/test_2d.composite.solid.luminosity.html → ...t/test_2d.composite.solid.luminosity.html
diff --git a/...est/test_2d.composite.solid.multiply.html → ...est/test_2d.composite.solid.multiply.html b/...est/test_2d.composite.solid.multiply.html → ...est/test_2d.composite.solid.multiply.html
diff --git a/...test/test_2d.composite.solid.overlay.html → ...test/test_2d.composite.solid.overlay.html b/...test/test_2d.composite.solid.overlay.html → ...test/test_2d.composite.solid.overlay.html
diff --git a/...t/test_2d.composite.solid.saturation.html → ...t/test_2d.composite.solid.saturation.html b/...t/test_2d.composite.solid.saturation.html → ...t/test_2d.composite.solid.saturation.html
diff --git a/.../test/test_2d.composite.solid.screen.html → .../test/test_2d.composite.solid.screen.html b/.../test/test_2d.composite.solid.screen.html → .../test/test_2d.composite.solid.screen.html
diff --git a/...t/test_2d.composite.solid.soft-light.html → ...t/test_2d.composite.solid.soft-light.html b/...t/test_2d.composite.solid.soft-light.html → ...t/test_2d.composite.solid.soft-light.html
diff --git a/...vas/test/test_2d.composite.solid.xor.html → ...vas/test/test_2d.composite.solid.xor.html b/...vas/test/test_2d.composite.solid.xor.html → ...vas/test/test_2d.composite.solid.xor.html
diff --git a/...est_2d.composite.transparent.lighter.html → ...est_2d.composite.transparent.lighter.html b/...est_2d.composite.transparent.lighter.html → ...est_2d.composite.transparent.lighter.html
diff --git a/...st/test_2d.composite.transparent.xor.html → ...st/test_2d.composite.transparent.xor.html b/...st/test_2d.composite.transparent.xor.html → ...st/test_2d.composite.transparent.xor.html
diff --git a/....composite.uncovered.fill.color-burn.html → ....composite.uncovered.fill.color-burn.html b/....composite.uncovered.fill.color-burn.html → ....composite.uncovered.fill.color-burn.html
diff --git a/...composite.uncovered.fill.color-dodge.html → ...composite.uncovered.fill.color-dodge.html b/...composite.uncovered.fill.color-dodge.html → ...composite.uncovered.fill.color-dodge.html
diff --git a/...st_2d.composite.uncovered.fill.color.html → ...st_2d.composite.uncovered.fill.color.html b/...st_2d.composite.uncovered.fill.color.html → ...st_2d.composite.uncovered.fill.color.html
diff --git a/...t_2d.composite.uncovered.fill.darken.html → ...t_2d.composite.uncovered.fill.darken.html b/...t_2d.composite.uncovered.fill.darken.html → ...t_2d.composite.uncovered.fill.darken.html
diff --git a/...site.uncovered.fill.destination-atop.html → ...site.uncovered.fill.destination-atop.html b/...site.uncovered.fill.destination-atop.html → ...site.uncovered.fill.destination-atop.html
diff --git a/...posite.uncovered.fill.destination-in.html → ...posite.uncovered.fill.destination-in.html b/...posite.uncovered.fill.destination-in.html → ...posite.uncovered.fill.destination-in.html
diff --git a/....composite.uncovered.fill.difference.html → ....composite.uncovered.fill.difference.html b/....composite.uncovered.fill.difference.html → ....composite.uncovered.fill.difference.html
diff --git a/...d.composite.uncovered.fill.exclusion.html → ...d.composite.uncovered.fill.exclusion.html b/...d.composite.uncovered.fill.exclusion.html → ...d.composite.uncovered.fill.exclusion.html
diff --git a/....composite.uncovered.fill.hard-light.html → ....composite.uncovered.fill.hard-light.html b/....composite.uncovered.fill.hard-light.html → ....composite.uncovered.fill.hard-light.html
diff --git a/...test_2d.composite.uncovered.fill.hue.html → ...test_2d.composite.uncovered.fill.hue.html b/...test_2d.composite.uncovered.fill.hue.html → ...test_2d.composite.uncovered.fill.hue.html
diff --git a/..._2d.composite.uncovered.fill.lighten.html → ..._2d.composite.uncovered.fill.lighten.html b/..._2d.composite.uncovered.fill.lighten.html → ..._2d.composite.uncovered.fill.lighten.html
diff --git a/....composite.uncovered.fill.luminosity.html → ....composite.uncovered.fill.luminosity.html b/....composite.uncovered.fill.luminosity.html → ....composite.uncovered.fill.luminosity.html
diff --git a/...2d.composite.uncovered.fill.multiply.html → ...2d.composite.uncovered.fill.multiply.html b/...2d.composite.uncovered.fill.multiply.html → ...2d.composite.uncovered.fill.multiply.html
diff --git a/..._2d.composite.uncovered.fill.overlay.html → ..._2d.composite.uncovered.fill.overlay.html b/..._2d.composite.uncovered.fill.overlay.html → ..._2d.composite.uncovered.fill.overlay.html
diff --git a/....composite.uncovered.fill.saturation.html → ....composite.uncovered.fill.saturation.html b/....composite.uncovered.fill.saturation.html → ....composite.uncovered.fill.saturation.html
diff --git a/...t_2d.composite.uncovered.fill.screen.html → ...t_2d.composite.uncovered.fill.screen.html b/...t_2d.composite.uncovered.fill.screen.html → ...t_2d.composite.uncovered.fill.screen.html
diff --git a/....composite.uncovered.fill.soft-light.html → ....composite.uncovered.fill.soft-light.html b/....composite.uncovered.fill.soft-light.html → ....composite.uncovered.fill.soft-light.html
diff --git a/...d.composite.uncovered.fill.source-in.html → ...d.composite.uncovered.fill.source-in.html b/...d.composite.uncovered.fill.source-in.html → ...d.composite.uncovered.fill.source-in.html
diff --git a/....composite.uncovered.fill.source-out.html → ....composite.uncovered.fill.source-out.html b/....composite.uncovered.fill.source-out.html → ....composite.uncovered.fill.source-out.html
diff --git a/...ite.uncovered.image.destination-atop.html → ...ite.uncovered.image.destination-atop.html b/...ite.uncovered.image.destination-atop.html → ...ite.uncovered.image.destination-atop.html
diff --git a/...osite.uncovered.image.destination-in.html → ...osite.uncovered.image.destination-in.html b/...osite.uncovered.image.destination-in.html → ...osite.uncovered.image.destination-in.html
diff --git a/....composite.uncovered.image.source-in.html → ....composite.uncovered.image.source-in.html b/....composite.uncovered.image.source-in.html → ....composite.uncovered.image.source-in.html
diff --git a/...composite.uncovered.image.source-out.html → ...composite.uncovered.image.source-out.html b/...composite.uncovered.image.source-out.html → ...composite.uncovered.image.source-out.html
diff --git a/...e.uncovered.pattern.destination-atop.html → ...e.uncovered.pattern.destination-atop.html b/...e.uncovered.pattern.destination-atop.html → ...e.uncovered.pattern.destination-atop.html
diff --git a/...ite.uncovered.pattern.destination-in.html → ...ite.uncovered.pattern.destination-in.html b/...ite.uncovered.pattern.destination-in.html → ...ite.uncovered.pattern.destination-in.html
diff --git a/...omposite.uncovered.pattern.source-in.html → ...omposite.uncovered.pattern.source-in.html b/...omposite.uncovered.pattern.source-in.html → ...omposite.uncovered.pattern.source-in.html
diff --git a/...mposite.uncovered.pattern.source-out.html → ...mposite.uncovered.pattern.source-out.html b/...mposite.uncovered.pattern.source-out.html → ...mposite.uncovered.pattern.source-out.html
diff --git a/...as/test/test_2d.drawImage.zerocanvas.html → ...as/test/test_2d.drawImage.zerocanvas.html b/...as/test/test_2d.drawImage.zerocanvas.html → ...as/test/test_2d.drawImage.zerocanvas.html
diff --git a/...ent/canvas/test/test_2d.fill.winding.html → dom/canvas/test/test_2d.fill.winding.html b/...ent/canvas/test/test_2d.fill.winding.html → dom/canvas/test/test_2d.fill.winding.html
diff --git a/...anvas/test/test_2d.fillText.gradient.html → ...anvas/test/test_2d.fillText.gradient.html b/...anvas/test/test_2d.fillText.gradient.html → ...anvas/test/test_2d.fillText.gradient.html
diff --git a/.../test_2d.gradient.radial.cone.behind.html → .../test_2d.gradient.radial.cone.behind.html b/.../test_2d.gradient.radial.cone.behind.html → .../test_2d.gradient.radial.cone.behind.html
diff --git a/.../test_2d.gradient.radial.cone.beside.html → .../test_2d.gradient.radial.cone.beside.html b/.../test_2d.gradient.radial.cone.beside.html → .../test_2d.gradient.radial.cone.beside.html
diff --git a/...t/test_2d.gradient.radial.cone.front.html → ...t/test_2d.gradient.radial.cone.front.html b/...t/test_2d.gradient.radial.cone.front.html → ...t/test_2d.gradient.radial.cone.front.html
diff --git a/.../test_2d.gradient.radial.cone.shape2.html → .../test_2d.gradient.radial.cone.shape2.html b/.../test_2d.gradient.radial.cone.shape2.html → .../test_2d.gradient.radial.cone.shape2.html
diff --git a/...est/test_2d.gradient.radial.cone.top.html → ...est/test_2d.gradient.radial.cone.top.html b/...est/test_2d.gradient.radial.cone.top.html → ...est/test_2d.gradient.radial.cone.top.html
diff --git a/...s/test/test_2d.gradient.radial.equal.html → ...s/test/test_2d.gradient.radial.equal.html b/...s/test/test_2d.gradient.radial.equal.html → ...s/test/test_2d.gradient.radial.equal.html
diff --git a/...test/test_2d.gradient.radial.inside2.html → ...test/test_2d.gradient.radial.inside2.html b/...test/test_2d.gradient.radial.inside2.html → ...test/test_2d.gradient.radial.inside2.html
diff --git a/...test/test_2d.gradient.radial.inside3.html → ...test/test_2d.gradient.radial.inside3.html b/...test/test_2d.gradient.radial.inside3.html → ...test/test_2d.gradient.radial.inside3.html
diff --git a/...est/test_2d.gradient.radial.outside1.html → ...est/test_2d.gradient.radial.outside1.html b/...est/test_2d.gradient.radial.outside1.html → ...est/test_2d.gradient.radial.outside1.html
diff --git a/...est/test_2d.gradient.radial.outside2.html → ...est/test_2d.gradient.radial.outside2.html b/...est/test_2d.gradient.radial.outside2.html → ...est/test_2d.gradient.radial.outside2.html
diff --git a/...est/test_2d.gradient.radial.outside3.html → ...est/test_2d.gradient.radial.outside3.html b/...est/test_2d.gradient.radial.outside3.html → ...est/test_2d.gradient.radial.outside3.html
diff --git a/.../test/test_2d.gradient.radial.touch1.html → .../test/test_2d.gradient.radial.touch1.html b/.../test/test_2d.gradient.radial.touch1.html → .../test/test_2d.gradient.radial.touch1.html
diff --git a/.../test/test_2d.gradient.radial.touch2.html → .../test/test_2d.gradient.radial.touch2.html b/.../test/test_2d.gradient.radial.touch2.html → .../test/test_2d.gradient.radial.touch2.html
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		HTTP 302 Moved
		Location: http://example.com/tests/dom/canvas/test/image_green-1x1.png