diff --git a/content/canvas/moz.build b/content/canvas/moz.build deleted file mode 100644 index b666b2e804a3..000000000000 --- a/content/canvas/moz.build +++ /dev/null @@ -1,10 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -PARALLEL_DIRS += ['public', 'src'] -TEST_DIRS += ['test'] - -TEST_TOOL_DIRS += ['compiledtest'] diff --git a/content/canvas/public/moz.build b/content/canvas/public/moz.build deleted file mode 100644 index 774482005ebd..000000000000 --- a/content/canvas/public/moz.build +++ /dev/null @@ -1,15 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# 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/. - -EXPORTS += [ - 'nsICanvasRenderingContextInternal.h', -] - -EXPORTS.mozilla.ipc += [ - 'DocumentRendererChild.h', - 'DocumentRendererParent.h', -] - diff --git a/content/canvas/test/android.json b/content/canvas/test/android.json deleted file mode 100644 index f6697b7a149e..000000000000 --- a/content/canvas/test/android.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "runtests": {}, - "excludetests": { - "content/canvas/test/webgl/test_webgl_conformance_test_suite.html": "" - } -} diff --git a/content/canvas/test/image_green-redirect^headers^ b/content/canvas/test/image_green-redirect^headers^ deleted file mode 100644 index e54e486c1a55..000000000000 --- a/content/canvas/test/image_green-redirect^headers^ +++ /dev/null @@ -1,2 +0,0 @@ -HTTP 302 Moved -Location: http://example.com/tests/content/canvas/test/image_green-1x1.png diff --git a/content/html/content/src/HTMLCanvasElement.cpp b/content/html/content/src/HTMLCanvasElement.cpp index 1836bbebcaf6..012238a7a709 100644 --- 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 index 88948c875279..a793993d9894 100644 --- 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 index 6c174ed42c03..1dcdcad54c2c 100644 --- 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 index 0042059d6a3e..f292a87f41f7 100644 --- 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 index 1162b0cedd6b..c72a987d7b8e 100644 --- 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 b/dom/canvas/CanvasGradient.h similarity index 100% rename from content/canvas/src/CanvasGradient.h rename to dom/canvas/CanvasGradient.h diff --git a/content/canvas/src/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp similarity index 100% rename from content/canvas/src/CanvasImageCache.cpp rename to dom/canvas/CanvasImageCache.cpp diff --git a/content/canvas/src/CanvasImageCache.h b/dom/canvas/CanvasImageCache.h similarity index 100% rename from content/canvas/src/CanvasImageCache.h rename to dom/canvas/CanvasImageCache.h diff --git a/content/canvas/src/CanvasPattern.h b/dom/canvas/CanvasPattern.h similarity index 100% rename from content/canvas/src/CanvasPattern.h rename to dom/canvas/CanvasPattern.h diff --git a/content/canvas/src/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp similarity index 100% rename from content/canvas/src/CanvasRenderingContext2D.cpp rename to dom/canvas/CanvasRenderingContext2D.cpp diff --git a/content/canvas/src/CanvasRenderingContext2D.h b/dom/canvas/CanvasRenderingContext2D.h similarity index 100% rename from content/canvas/src/CanvasRenderingContext2D.h rename to dom/canvas/CanvasRenderingContext2D.h diff --git a/content/canvas/src/CanvasUtils.cpp b/dom/canvas/CanvasUtils.cpp similarity index 100% rename from content/canvas/src/CanvasUtils.cpp rename to dom/canvas/CanvasUtils.cpp diff --git a/content/canvas/src/CanvasUtils.h b/dom/canvas/CanvasUtils.h similarity index 100% rename from content/canvas/src/CanvasUtils.h rename to dom/canvas/CanvasUtils.h diff --git a/content/canvas/src/DocumentRendererChild.cpp b/dom/canvas/DocumentRendererChild.cpp similarity index 100% rename from content/canvas/src/DocumentRendererChild.cpp rename to dom/canvas/DocumentRendererChild.cpp diff --git a/content/canvas/public/DocumentRendererChild.h b/dom/canvas/DocumentRendererChild.h similarity index 100% rename from content/canvas/public/DocumentRendererChild.h rename to dom/canvas/DocumentRendererChild.h diff --git a/content/canvas/src/DocumentRendererParent.cpp b/dom/canvas/DocumentRendererParent.cpp similarity index 100% rename from content/canvas/src/DocumentRendererParent.cpp rename to dom/canvas/DocumentRendererParent.cpp diff --git a/content/canvas/public/DocumentRendererParent.h b/dom/canvas/DocumentRendererParent.h similarity index 100% rename from content/canvas/public/DocumentRendererParent.h rename to dom/canvas/DocumentRendererParent.h diff --git a/content/canvas/src/ImageData.cpp b/dom/canvas/ImageData.cpp similarity index 100% rename from content/canvas/src/ImageData.cpp rename to dom/canvas/ImageData.cpp diff --git a/content/canvas/src/ImageData.h b/dom/canvas/ImageData.h similarity index 100% rename from content/canvas/src/ImageData.h rename to dom/canvas/ImageData.h diff --git a/content/canvas/src/ImageEncoder.cpp b/dom/canvas/ImageEncoder.cpp similarity index 100% rename from content/canvas/src/ImageEncoder.cpp rename to dom/canvas/ImageEncoder.cpp diff --git a/content/canvas/src/ImageEncoder.h b/dom/canvas/ImageEncoder.h similarity index 100% rename from content/canvas/src/ImageEncoder.h rename to dom/canvas/ImageEncoder.h diff --git a/content/canvas/src/Makefile.in b/dom/canvas/Makefile.in similarity index 100% rename from content/canvas/src/Makefile.in rename to dom/canvas/Makefile.in diff --git a/content/canvas/src/MurmurHash3.cpp b/dom/canvas/MurmurHash3.cpp similarity index 100% rename from content/canvas/src/MurmurHash3.cpp rename to dom/canvas/MurmurHash3.cpp diff --git a/content/canvas/src/MurmurHash3.h b/dom/canvas/MurmurHash3.h similarity index 100% rename from content/canvas/src/MurmurHash3.h rename to dom/canvas/MurmurHash3.h diff --git a/content/canvas/src/TextMetrics.h b/dom/canvas/TextMetrics.h similarity index 100% rename from content/canvas/src/TextMetrics.h rename to dom/canvas/TextMetrics.h diff --git a/content/canvas/src/WebGL1Context.cpp b/dom/canvas/WebGL1Context.cpp similarity index 100% rename from content/canvas/src/WebGL1Context.cpp rename to dom/canvas/WebGL1Context.cpp diff --git a/content/canvas/src/WebGL1Context.h b/dom/canvas/WebGL1Context.h similarity index 100% rename from content/canvas/src/WebGL1Context.h rename to dom/canvas/WebGL1Context.h diff --git a/content/canvas/src/WebGL2Context.cpp b/dom/canvas/WebGL2Context.cpp similarity index 100% rename from content/canvas/src/WebGL2Context.cpp rename to dom/canvas/WebGL2Context.cpp diff --git a/content/canvas/src/WebGL2Context.h b/dom/canvas/WebGL2Context.h similarity index 100% rename from content/canvas/src/WebGL2Context.h rename to dom/canvas/WebGL2Context.h diff --git a/content/canvas/src/WebGLActiveInfo.cpp b/dom/canvas/WebGLActiveInfo.cpp similarity index 100% rename from content/canvas/src/WebGLActiveInfo.cpp rename to dom/canvas/WebGLActiveInfo.cpp diff --git a/content/canvas/src/WebGLActiveInfo.h b/dom/canvas/WebGLActiveInfo.h similarity index 100% rename from content/canvas/src/WebGLActiveInfo.h rename to dom/canvas/WebGLActiveInfo.h diff --git a/content/canvas/src/WebGLBuffer.cpp b/dom/canvas/WebGLBuffer.cpp similarity index 100% rename from content/canvas/src/WebGLBuffer.cpp rename to dom/canvas/WebGLBuffer.cpp diff --git a/content/canvas/src/WebGLBuffer.h b/dom/canvas/WebGLBuffer.h similarity index 100% rename from content/canvas/src/WebGLBuffer.h rename to dom/canvas/WebGLBuffer.h diff --git a/content/canvas/src/WebGLContext.cpp b/dom/canvas/WebGLContext.cpp similarity index 100% rename from content/canvas/src/WebGLContext.cpp rename to dom/canvas/WebGLContext.cpp diff --git a/content/canvas/src/WebGLContext.h b/dom/canvas/WebGLContext.h similarity index 100% rename from content/canvas/src/WebGLContext.h rename to dom/canvas/WebGLContext.h diff --git a/content/canvas/src/WebGLContextAsyncQueries.cpp b/dom/canvas/WebGLContextAsyncQueries.cpp similarity index 100% rename from content/canvas/src/WebGLContextAsyncQueries.cpp rename to dom/canvas/WebGLContextAsyncQueries.cpp diff --git a/content/canvas/src/WebGLContextBuffers.cpp b/dom/canvas/WebGLContextBuffers.cpp similarity index 100% rename from content/canvas/src/WebGLContextBuffers.cpp rename to dom/canvas/WebGLContextBuffers.cpp diff --git a/content/canvas/src/WebGLContextDraw.cpp b/dom/canvas/WebGLContextDraw.cpp similarity index 100% rename from content/canvas/src/WebGLContextDraw.cpp rename to dom/canvas/WebGLContextDraw.cpp diff --git a/content/canvas/src/WebGLContextExtensions.cpp b/dom/canvas/WebGLContextExtensions.cpp similarity index 100% rename from content/canvas/src/WebGLContextExtensions.cpp rename to dom/canvas/WebGLContextExtensions.cpp diff --git a/content/canvas/src/WebGLContextFramebufferOperations.cpp b/dom/canvas/WebGLContextFramebufferOperations.cpp similarity index 100% rename from content/canvas/src/WebGLContextFramebufferOperations.cpp rename to dom/canvas/WebGLContextFramebufferOperations.cpp diff --git a/content/canvas/src/WebGLContextGL.cpp b/dom/canvas/WebGLContextGL.cpp similarity index 100% rename from content/canvas/src/WebGLContextGL.cpp rename to dom/canvas/WebGLContextGL.cpp diff --git a/content/canvas/src/WebGLContextLossTimer.cpp b/dom/canvas/WebGLContextLossTimer.cpp similarity index 100% rename from content/canvas/src/WebGLContextLossTimer.cpp rename to dom/canvas/WebGLContextLossTimer.cpp diff --git a/content/canvas/src/WebGLContextNotSupported.cpp b/dom/canvas/WebGLContextNotSupported.cpp similarity index 100% rename from content/canvas/src/WebGLContextNotSupported.cpp rename to dom/canvas/WebGLContextNotSupported.cpp diff --git a/content/canvas/src/WebGLContextReporter.cpp b/dom/canvas/WebGLContextReporter.cpp similarity index 100% rename from content/canvas/src/WebGLContextReporter.cpp rename to dom/canvas/WebGLContextReporter.cpp diff --git a/content/canvas/src/WebGLContextState.cpp b/dom/canvas/WebGLContextState.cpp similarity index 100% rename from content/canvas/src/WebGLContextState.cpp rename to dom/canvas/WebGLContextState.cpp diff --git a/content/canvas/src/WebGLContextUtils.cpp b/dom/canvas/WebGLContextUtils.cpp similarity index 100% rename from content/canvas/src/WebGLContextUtils.cpp rename to dom/canvas/WebGLContextUtils.cpp diff --git a/content/canvas/src/WebGLContextUtils.h b/dom/canvas/WebGLContextUtils.h similarity index 100% rename from content/canvas/src/WebGLContextUtils.h rename to dom/canvas/WebGLContextUtils.h diff --git a/content/canvas/src/WebGLContextValidate.cpp b/dom/canvas/WebGLContextValidate.cpp similarity index 100% rename from content/canvas/src/WebGLContextValidate.cpp rename to dom/canvas/WebGLContextValidate.cpp diff --git a/content/canvas/src/WebGLContextVertexArray.cpp b/dom/canvas/WebGLContextVertexArray.cpp similarity index 100% rename from content/canvas/src/WebGLContextVertexArray.cpp rename to dom/canvas/WebGLContextVertexArray.cpp diff --git a/content/canvas/src/WebGLContextVertices.cpp b/dom/canvas/WebGLContextVertices.cpp similarity index 100% rename from content/canvas/src/WebGLContextVertices.cpp rename to dom/canvas/WebGLContextVertices.cpp diff --git a/content/canvas/src/WebGLElementArrayCache.cpp b/dom/canvas/WebGLElementArrayCache.cpp similarity index 100% rename from content/canvas/src/WebGLElementArrayCache.cpp rename to dom/canvas/WebGLElementArrayCache.cpp diff --git a/content/canvas/src/WebGLElementArrayCache.h b/dom/canvas/WebGLElementArrayCache.h similarity index 100% rename from content/canvas/src/WebGLElementArrayCache.h rename to dom/canvas/WebGLElementArrayCache.h diff --git a/content/canvas/src/WebGLExtensionBase.cpp b/dom/canvas/WebGLExtensionBase.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionBase.cpp rename to dom/canvas/WebGLExtensionBase.cpp diff --git a/content/canvas/src/WebGLExtensionBlendMinMax.cpp b/dom/canvas/WebGLExtensionBlendMinMax.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionBlendMinMax.cpp rename to dom/canvas/WebGLExtensionBlendMinMax.cpp diff --git a/content/canvas/src/WebGLExtensionColorBufferFloat.cpp b/dom/canvas/WebGLExtensionColorBufferFloat.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionColorBufferFloat.cpp rename to dom/canvas/WebGLExtensionColorBufferFloat.cpp diff --git a/content/canvas/src/WebGLExtensionColorBufferHalfFloat.cpp b/dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionColorBufferHalfFloat.cpp rename to dom/canvas/WebGLExtensionColorBufferHalfFloat.cpp diff --git a/content/canvas/src/WebGLExtensionCompressedTextureATC.cpp b/dom/canvas/WebGLExtensionCompressedTextureATC.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionCompressedTextureATC.cpp rename to dom/canvas/WebGLExtensionCompressedTextureATC.cpp diff --git a/content/canvas/src/WebGLExtensionCompressedTextureETC1.cpp b/dom/canvas/WebGLExtensionCompressedTextureETC1.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionCompressedTextureETC1.cpp rename to dom/canvas/WebGLExtensionCompressedTextureETC1.cpp diff --git a/content/canvas/src/WebGLExtensionCompressedTexturePVRTC.cpp b/dom/canvas/WebGLExtensionCompressedTexturePVRTC.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionCompressedTexturePVRTC.cpp rename to dom/canvas/WebGLExtensionCompressedTexturePVRTC.cpp diff --git a/content/canvas/src/WebGLExtensionCompressedTextureS3TC.cpp b/dom/canvas/WebGLExtensionCompressedTextureS3TC.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionCompressedTextureS3TC.cpp rename to dom/canvas/WebGLExtensionCompressedTextureS3TC.cpp diff --git a/content/canvas/src/WebGLExtensionDebugRendererInfo.cpp b/dom/canvas/WebGLExtensionDebugRendererInfo.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionDebugRendererInfo.cpp rename to dom/canvas/WebGLExtensionDebugRendererInfo.cpp diff --git a/content/canvas/src/WebGLExtensionDebugShaders.cpp b/dom/canvas/WebGLExtensionDebugShaders.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionDebugShaders.cpp rename to dom/canvas/WebGLExtensionDebugShaders.cpp diff --git a/content/canvas/src/WebGLExtensionDepthTexture.cpp b/dom/canvas/WebGLExtensionDepthTexture.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionDepthTexture.cpp rename to dom/canvas/WebGLExtensionDepthTexture.cpp diff --git a/content/canvas/src/WebGLExtensionDrawBuffers.cpp b/dom/canvas/WebGLExtensionDrawBuffers.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionDrawBuffers.cpp rename to dom/canvas/WebGLExtensionDrawBuffers.cpp diff --git a/content/canvas/src/WebGLExtensionElementIndexUint.cpp b/dom/canvas/WebGLExtensionElementIndexUint.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionElementIndexUint.cpp rename to dom/canvas/WebGLExtensionElementIndexUint.cpp diff --git a/content/canvas/src/WebGLExtensionFragDepth.cpp b/dom/canvas/WebGLExtensionFragDepth.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionFragDepth.cpp rename to dom/canvas/WebGLExtensionFragDepth.cpp diff --git a/content/canvas/src/WebGLExtensionInstancedArrays.cpp b/dom/canvas/WebGLExtensionInstancedArrays.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionInstancedArrays.cpp rename to dom/canvas/WebGLExtensionInstancedArrays.cpp diff --git a/content/canvas/src/WebGLExtensionLoseContext.cpp b/dom/canvas/WebGLExtensionLoseContext.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionLoseContext.cpp rename to dom/canvas/WebGLExtensionLoseContext.cpp diff --git a/content/canvas/src/WebGLExtensionSRGB.cpp b/dom/canvas/WebGLExtensionSRGB.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionSRGB.cpp rename to dom/canvas/WebGLExtensionSRGB.cpp diff --git a/content/canvas/src/WebGLExtensionStandardDerivatives.cpp b/dom/canvas/WebGLExtensionStandardDerivatives.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionStandardDerivatives.cpp rename to dom/canvas/WebGLExtensionStandardDerivatives.cpp diff --git a/content/canvas/src/WebGLExtensionTextureFilterAnisotropic.cpp b/dom/canvas/WebGLExtensionTextureFilterAnisotropic.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionTextureFilterAnisotropic.cpp rename to dom/canvas/WebGLExtensionTextureFilterAnisotropic.cpp diff --git a/content/canvas/src/WebGLExtensionTextureFloat.cpp b/dom/canvas/WebGLExtensionTextureFloat.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionTextureFloat.cpp rename to dom/canvas/WebGLExtensionTextureFloat.cpp diff --git a/content/canvas/src/WebGLExtensionTextureFloatLinear.cpp b/dom/canvas/WebGLExtensionTextureFloatLinear.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionTextureFloatLinear.cpp rename to dom/canvas/WebGLExtensionTextureFloatLinear.cpp diff --git a/content/canvas/src/WebGLExtensionTextureHalfFloat.cpp b/dom/canvas/WebGLExtensionTextureHalfFloat.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionTextureHalfFloat.cpp rename to dom/canvas/WebGLExtensionTextureHalfFloat.cpp diff --git a/content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp b/dom/canvas/WebGLExtensionTextureHalfFloatLinear.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionTextureHalfFloatLinear.cpp rename to dom/canvas/WebGLExtensionTextureHalfFloatLinear.cpp diff --git a/content/canvas/src/WebGLExtensionVertexArray.cpp b/dom/canvas/WebGLExtensionVertexArray.cpp similarity index 100% rename from content/canvas/src/WebGLExtensionVertexArray.cpp rename to dom/canvas/WebGLExtensionVertexArray.cpp diff --git a/content/canvas/src/WebGLExtensions.h b/dom/canvas/WebGLExtensions.h similarity index 100% rename from content/canvas/src/WebGLExtensions.h rename to dom/canvas/WebGLExtensions.h diff --git a/content/canvas/src/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp similarity index 100% rename from content/canvas/src/WebGLFramebuffer.cpp rename to dom/canvas/WebGLFramebuffer.cpp diff --git a/content/canvas/src/WebGLFramebuffer.h b/dom/canvas/WebGLFramebuffer.h similarity index 100% rename from content/canvas/src/WebGLFramebuffer.h rename to dom/canvas/WebGLFramebuffer.h diff --git a/content/canvas/src/WebGLFramebufferAttachable.cpp b/dom/canvas/WebGLFramebufferAttachable.cpp similarity index 100% rename from content/canvas/src/WebGLFramebufferAttachable.cpp rename to dom/canvas/WebGLFramebufferAttachable.cpp diff --git a/content/canvas/src/WebGLFramebufferAttachable.h b/dom/canvas/WebGLFramebufferAttachable.h similarity index 100% rename from content/canvas/src/WebGLFramebufferAttachable.h rename to dom/canvas/WebGLFramebufferAttachable.h diff --git a/content/canvas/src/WebGLMemoryTracker.h b/dom/canvas/WebGLMemoryTracker.h similarity index 100% rename from content/canvas/src/WebGLMemoryTracker.h rename to dom/canvas/WebGLMemoryTracker.h diff --git a/content/canvas/src/WebGLObjectModel.cpp b/dom/canvas/WebGLObjectModel.cpp similarity index 100% rename from content/canvas/src/WebGLObjectModel.cpp rename to dom/canvas/WebGLObjectModel.cpp diff --git a/content/canvas/src/WebGLObjectModel.h b/dom/canvas/WebGLObjectModel.h similarity index 100% rename from content/canvas/src/WebGLObjectModel.h rename to dom/canvas/WebGLObjectModel.h diff --git a/content/canvas/src/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp similarity index 100% rename from content/canvas/src/WebGLProgram.cpp rename to dom/canvas/WebGLProgram.cpp diff --git a/content/canvas/src/WebGLProgram.h b/dom/canvas/WebGLProgram.h similarity index 100% rename from content/canvas/src/WebGLProgram.h rename to dom/canvas/WebGLProgram.h diff --git a/content/canvas/src/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp similarity index 100% rename from content/canvas/src/WebGLQuery.cpp rename to dom/canvas/WebGLQuery.cpp diff --git a/content/canvas/src/WebGLQuery.h b/dom/canvas/WebGLQuery.h similarity index 100% rename from content/canvas/src/WebGLQuery.h rename to dom/canvas/WebGLQuery.h diff --git a/content/canvas/src/WebGLRenderbuffer.cpp b/dom/canvas/WebGLRenderbuffer.cpp similarity index 100% rename from content/canvas/src/WebGLRenderbuffer.cpp rename to dom/canvas/WebGLRenderbuffer.cpp diff --git a/content/canvas/src/WebGLRenderbuffer.h b/dom/canvas/WebGLRenderbuffer.h similarity index 100% rename from content/canvas/src/WebGLRenderbuffer.h rename to dom/canvas/WebGLRenderbuffer.h diff --git a/content/canvas/src/WebGLShader.cpp b/dom/canvas/WebGLShader.cpp similarity index 100% rename from content/canvas/src/WebGLShader.cpp rename to dom/canvas/WebGLShader.cpp diff --git a/content/canvas/src/WebGLShader.h b/dom/canvas/WebGLShader.h similarity index 100% rename from content/canvas/src/WebGLShader.h rename to dom/canvas/WebGLShader.h diff --git a/content/canvas/src/WebGLShaderPrecisionFormat.cpp b/dom/canvas/WebGLShaderPrecisionFormat.cpp similarity index 100% rename from content/canvas/src/WebGLShaderPrecisionFormat.cpp rename to dom/canvas/WebGLShaderPrecisionFormat.cpp diff --git a/content/canvas/src/WebGLShaderPrecisionFormat.h b/dom/canvas/WebGLShaderPrecisionFormat.h similarity index 100% rename from content/canvas/src/WebGLShaderPrecisionFormat.h rename to dom/canvas/WebGLShaderPrecisionFormat.h diff --git a/content/canvas/src/WebGLTexelConversions.cpp b/dom/canvas/WebGLTexelConversions.cpp similarity index 100% rename from content/canvas/src/WebGLTexelConversions.cpp rename to dom/canvas/WebGLTexelConversions.cpp diff --git a/content/canvas/src/WebGLTexelConversions.h b/dom/canvas/WebGLTexelConversions.h similarity index 100% rename from content/canvas/src/WebGLTexelConversions.h rename to dom/canvas/WebGLTexelConversions.h diff --git a/content/canvas/src/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp similarity index 100% rename from content/canvas/src/WebGLTexture.cpp rename to dom/canvas/WebGLTexture.cpp diff --git a/content/canvas/src/WebGLTexture.h b/dom/canvas/WebGLTexture.h similarity index 100% rename from content/canvas/src/WebGLTexture.h rename to dom/canvas/WebGLTexture.h diff --git a/content/canvas/src/WebGLTypes.h b/dom/canvas/WebGLTypes.h similarity index 100% rename from content/canvas/src/WebGLTypes.h rename to dom/canvas/WebGLTypes.h diff --git a/content/canvas/src/WebGLUniformInfo.h b/dom/canvas/WebGLUniformInfo.h similarity index 100% rename from content/canvas/src/WebGLUniformInfo.h rename to dom/canvas/WebGLUniformInfo.h diff --git a/content/canvas/src/WebGLUniformLocation.cpp b/dom/canvas/WebGLUniformLocation.cpp similarity index 100% rename from content/canvas/src/WebGLUniformLocation.cpp rename to dom/canvas/WebGLUniformLocation.cpp diff --git a/content/canvas/src/WebGLUniformLocation.h b/dom/canvas/WebGLUniformLocation.h similarity index 100% rename from content/canvas/src/WebGLUniformLocation.h rename to dom/canvas/WebGLUniformLocation.h diff --git a/content/canvas/src/WebGLValidateStrings.h b/dom/canvas/WebGLValidateStrings.h similarity index 100% rename from content/canvas/src/WebGLValidateStrings.h rename to dom/canvas/WebGLValidateStrings.h diff --git a/content/canvas/src/WebGLVertexArray.cpp b/dom/canvas/WebGLVertexArray.cpp similarity index 100% rename from content/canvas/src/WebGLVertexArray.cpp rename to dom/canvas/WebGLVertexArray.cpp diff --git a/content/canvas/src/WebGLVertexArray.h b/dom/canvas/WebGLVertexArray.h similarity index 100% rename from content/canvas/src/WebGLVertexArray.h rename to dom/canvas/WebGLVertexArray.h diff --git a/content/canvas/src/WebGLVertexArrayFake.cpp b/dom/canvas/WebGLVertexArrayFake.cpp similarity index 100% rename from content/canvas/src/WebGLVertexArrayFake.cpp rename to dom/canvas/WebGLVertexArrayFake.cpp diff --git a/content/canvas/src/WebGLVertexArrayFake.h b/dom/canvas/WebGLVertexArrayFake.h similarity index 100% rename from content/canvas/src/WebGLVertexArrayFake.h rename to dom/canvas/WebGLVertexArrayFake.h diff --git a/content/canvas/src/WebGLVertexArrayGL.cpp b/dom/canvas/WebGLVertexArrayGL.cpp similarity index 100% rename from content/canvas/src/WebGLVertexArrayGL.cpp rename to dom/canvas/WebGLVertexArrayGL.cpp diff --git a/content/canvas/src/WebGLVertexArrayGL.h b/dom/canvas/WebGLVertexArrayGL.h similarity index 100% rename from content/canvas/src/WebGLVertexArrayGL.h rename to dom/canvas/WebGLVertexArrayGL.h diff --git a/content/canvas/src/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h similarity index 100% rename from content/canvas/src/WebGLVertexAttribData.h rename to dom/canvas/WebGLVertexAttribData.h diff --git a/content/canvas/compiledtest/TestWebGLElementArrayCache.cpp b/dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp similarity index 100% rename from content/canvas/compiledtest/TestWebGLElementArrayCache.cpp rename to dom/canvas/compiledtest/TestWebGLElementArrayCache.cpp diff --git a/content/canvas/compiledtest/moz.build b/dom/canvas/compiledtest/moz.build similarity index 97% rename from content/canvas/compiledtest/moz.build rename to dom/canvas/compiledtest/moz.build index 41bf30506e36..0de02180e44f 100644 --- a/content/canvas/compiledtest/moz.build +++ b/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/content/canvas/crashtests/0px-size-font-667225.html b/dom/canvas/crashtests/0px-size-font-667225.html similarity index 100% rename from content/canvas/crashtests/0px-size-font-667225.html rename to dom/canvas/crashtests/0px-size-font-667225.html diff --git a/content/canvas/crashtests/0px-size-font-shadow.html b/dom/canvas/crashtests/0px-size-font-shadow.html similarity index 100% rename from content/canvas/crashtests/0px-size-font-shadow.html rename to dom/canvas/crashtests/0px-size-font-shadow.html diff --git a/content/canvas/crashtests/360293-1.html b/dom/canvas/crashtests/360293-1.html similarity index 100% rename from content/canvas/crashtests/360293-1.html rename to dom/canvas/crashtests/360293-1.html diff --git a/content/canvas/crashtests/421715-1.html b/dom/canvas/crashtests/421715-1.html similarity index 100% rename from content/canvas/crashtests/421715-1.html rename to dom/canvas/crashtests/421715-1.html diff --git a/content/canvas/crashtests/553938-1.html b/dom/canvas/crashtests/553938-1.html similarity index 100% rename from content/canvas/crashtests/553938-1.html rename to dom/canvas/crashtests/553938-1.html diff --git a/content/canvas/crashtests/647480.html b/dom/canvas/crashtests/647480.html similarity index 100% rename from content/canvas/crashtests/647480.html rename to dom/canvas/crashtests/647480.html diff --git a/content/canvas/crashtests/727547.html b/dom/canvas/crashtests/727547.html similarity index 100% rename from content/canvas/crashtests/727547.html rename to dom/canvas/crashtests/727547.html diff --git a/content/canvas/crashtests/729116.html b/dom/canvas/crashtests/729116.html similarity index 100% rename from content/canvas/crashtests/729116.html rename to dom/canvas/crashtests/729116.html diff --git a/content/canvas/crashtests/743499-negative-size.html b/dom/canvas/crashtests/743499-negative-size.html similarity index 100% rename from content/canvas/crashtests/743499-negative-size.html rename to dom/canvas/crashtests/743499-negative-size.html diff --git a/content/canvas/crashtests/745699-1.html b/dom/canvas/crashtests/745699-1.html similarity index 100% rename from content/canvas/crashtests/745699-1.html rename to dom/canvas/crashtests/745699-1.html diff --git a/content/canvas/crashtests/745818-large-source.html b/dom/canvas/crashtests/745818-large-source.html similarity index 100% rename from content/canvas/crashtests/745818-large-source.html rename to dom/canvas/crashtests/745818-large-source.html diff --git a/content/canvas/crashtests/746813-1.html b/dom/canvas/crashtests/746813-1.html similarity index 100% rename from content/canvas/crashtests/746813-1.html rename to dom/canvas/crashtests/746813-1.html diff --git a/content/canvas/crashtests/767337-1.html b/dom/canvas/crashtests/767337-1.html similarity index 100% rename from content/canvas/crashtests/767337-1.html rename to dom/canvas/crashtests/767337-1.html diff --git a/content/canvas/crashtests/780392-1.html b/dom/canvas/crashtests/780392-1.html similarity index 100% rename from content/canvas/crashtests/780392-1.html rename to dom/canvas/crashtests/780392-1.html diff --git a/content/canvas/crashtests/789933-1.html b/dom/canvas/crashtests/789933-1.html similarity index 100% rename from content/canvas/crashtests/789933-1.html rename to dom/canvas/crashtests/789933-1.html diff --git a/content/canvas/crashtests/794463-1.html b/dom/canvas/crashtests/794463-1.html similarity index 100% rename from content/canvas/crashtests/794463-1.html rename to dom/canvas/crashtests/794463-1.html diff --git a/content/canvas/crashtests/802926-1.html b/dom/canvas/crashtests/802926-1.html similarity index 100% rename from content/canvas/crashtests/802926-1.html rename to dom/canvas/crashtests/802926-1.html diff --git a/content/canvas/crashtests/896047-1.html b/dom/canvas/crashtests/896047-1.html similarity index 100% rename from content/canvas/crashtests/896047-1.html rename to dom/canvas/crashtests/896047-1.html diff --git a/content/canvas/crashtests/896047-2.html b/dom/canvas/crashtests/896047-2.html similarity index 100% rename from content/canvas/crashtests/896047-2.html rename to dom/canvas/crashtests/896047-2.html diff --git a/content/canvas/crashtests/916128-1.html b/dom/canvas/crashtests/916128-1.html similarity index 100% rename from content/canvas/crashtests/916128-1.html rename to dom/canvas/crashtests/916128-1.html diff --git a/content/canvas/crashtests/934939-1.html b/dom/canvas/crashtests/934939-1.html similarity index 100% rename from content/canvas/crashtests/934939-1.html rename to dom/canvas/crashtests/934939-1.html diff --git a/content/canvas/crashtests/crashtests.list b/dom/canvas/crashtests/crashtests.list similarity index 100% rename from content/canvas/crashtests/crashtests.list rename to dom/canvas/crashtests/crashtests.list diff --git a/content/canvas/crashtests/texImage2D.html b/dom/canvas/crashtests/texImage2D.html similarity index 100% rename from content/canvas/crashtests/texImage2D.html rename to dom/canvas/crashtests/texImage2D.html diff --git a/content/canvas/src/moz.build b/dom/canvas/moz.build similarity index 94% rename from content/canvas/src/moz.build rename to dom/canvas/moz.build index f19d13d525ea..c2528cde2b3a 100644 --- a/content/canvas/src/moz.build +++ b/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/content/canvas/public/nsICanvasRenderingContextInternal.h b/dom/canvas/nsICanvasRenderingContextInternal.h similarity index 100% rename from content/canvas/public/nsICanvasRenderingContextInternal.h rename to dom/canvas/nsICanvasRenderingContextInternal.h diff --git a/dom/canvas/test/android.json b/dom/canvas/test/android.json new file mode 100644 index 000000000000..6170e32fb5f1 --- /dev/null +++ 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 b/dom/canvas/test/chrome/chrome.ini similarity index 100% rename from content/canvas/test/chrome/chrome.ini rename to dom/canvas/test/chrome/chrome.ini diff --git a/content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html b/dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html similarity index 100% rename from content/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html rename to dom/canvas/test/chrome/nonchrome_webgl_debug_renderer_info.html diff --git a/content/canvas/test/chrome/test_drawWindow_widget_layers.html b/dom/canvas/test/chrome/test_drawWindow_widget_layers.html similarity index 100% rename from content/canvas/test/chrome/test_drawWindow_widget_layers.html rename to dom/canvas/test/chrome/test_drawWindow_widget_layers.html diff --git a/content/canvas/test/chrome/test_webgl_debug_renderer_info.html b/dom/canvas/test/chrome/test_webgl_debug_renderer_info.html similarity index 96% rename from content/canvas/test/chrome/test_webgl_debug_renderer_info.html rename to dom/canvas/test/chrome/test_webgl_debug_renderer_info.html index abd9a4b714e9..46fabe54f741 100644 --- a/content/canvas/test/chrome/test_webgl_debug_renderer_info.html +++ b/dom/canvas/test/chrome/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/content/canvas/test/crossorigin/image-allow-credentials.png b/dom/canvas/test/crossorigin/image-allow-credentials.png similarity index 100% rename from content/canvas/test/crossorigin/image-allow-credentials.png rename to dom/canvas/test/crossorigin/image-allow-credentials.png diff --git a/content/canvas/test/crossorigin/image-allow-credentials.png^headers^ b/dom/canvas/test/crossorigin/image-allow-credentials.png^headers^ similarity index 100% rename from content/canvas/test/crossorigin/image-allow-credentials.png^headers^ rename to dom/canvas/test/crossorigin/image-allow-credentials.png^headers^ diff --git a/content/canvas/test/crossorigin/image-allow-star.png b/dom/canvas/test/crossorigin/image-allow-star.png similarity index 100% rename from content/canvas/test/crossorigin/image-allow-star.png rename to dom/canvas/test/crossorigin/image-allow-star.png diff --git a/content/canvas/test/crossorigin/image-allow-star.png^headers^ b/dom/canvas/test/crossorigin/image-allow-star.png^headers^ similarity index 100% rename from content/canvas/test/crossorigin/image-allow-star.png^headers^ rename to dom/canvas/test/crossorigin/image-allow-star.png^headers^ diff --git a/content/canvas/test/crossorigin/image.png b/dom/canvas/test/crossorigin/image.png similarity index 100% rename from content/canvas/test/crossorigin/image.png rename to dom/canvas/test/crossorigin/image.png diff --git a/content/canvas/test/crossorigin/mochitest.ini b/dom/canvas/test/crossorigin/mochitest.ini similarity index 100% rename from content/canvas/test/crossorigin/mochitest.ini rename to dom/canvas/test/crossorigin/mochitest.ini diff --git a/content/canvas/test/crossorigin/test_canvas2d_crossorigin.html b/dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html similarity index 98% rename from content/canvas/test/crossorigin/test_canvas2d_crossorigin.html rename to dom/canvas/test/crossorigin/test_canvas2d_crossorigin.html index 81a11176de7d..6571542be9fd 100644 --- a/content/canvas/test/crossorigin/test_canvas2d_crossorigin.html +++ b/dom/canvas/test/crossorigin/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/content/canvas/test/crossorigin/test_video_crossorigin.html b/dom/canvas/test/crossorigin/test_video_crossorigin.html similarity index 98% rename from content/canvas/test/crossorigin/test_video_crossorigin.html rename to dom/canvas/test/crossorigin/test_video_crossorigin.html index 5ae2313d4a38..ffd4bcb51109 100644 --- a/content/canvas/test/crossorigin/test_video_crossorigin.html +++ b/dom/canvas/test/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/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html b/dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html similarity index 65% rename from content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html rename to dom/canvas/test/crossorigin/test_webgl_crossorigin_textures.html index 2eaa38e133f2..545048a340d9 100644 --- a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html +++ b/dom/canvas/test/crossorigin/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 b/dom/canvas/test/crossorigin/video.sjs similarity index 100% rename from content/canvas/test/crossorigin/video.sjs rename to dom/canvas/test/crossorigin/video.sjs diff --git a/content/canvas/test/file_drawImage_document_domain.html b/dom/canvas/test/file_drawImage_document_domain.html similarity index 100% rename from content/canvas/test/file_drawImage_document_domain.html rename to dom/canvas/test/file_drawImage_document_domain.html diff --git a/content/canvas/test/file_drawWindow_common.js b/dom/canvas/test/file_drawWindow_common.js similarity index 100% rename from content/canvas/test/file_drawWindow_common.js rename to dom/canvas/test/file_drawWindow_common.js diff --git a/content/canvas/test/file_drawWindow_source.html b/dom/canvas/test/file_drawWindow_source.html similarity index 100% rename from content/canvas/test/file_drawWindow_source.html rename to dom/canvas/test/file_drawWindow_source.html diff --git a/content/canvas/test/image_anim-gr.gif b/dom/canvas/test/image_anim-gr.gif similarity index 100% rename from content/canvas/test/image_anim-gr.gif rename to dom/canvas/test/image_anim-gr.gif diff --git a/content/canvas/test/image_anim-gr.png b/dom/canvas/test/image_anim-gr.png similarity index 100% rename from content/canvas/test/image_anim-gr.png rename to dom/canvas/test/image_anim-gr.png diff --git a/content/canvas/test/image_anim-poster-gr.png b/dom/canvas/test/image_anim-poster-gr.png similarity index 100% rename from content/canvas/test/image_anim-poster-gr.png rename to dom/canvas/test/image_anim-poster-gr.png diff --git a/content/canvas/test/image_broken.png b/dom/canvas/test/image_broken.png similarity index 100% rename from content/canvas/test/image_broken.png rename to dom/canvas/test/image_broken.png diff --git a/content/canvas/test/image_ggrr-256x256.png b/dom/canvas/test/image_ggrr-256x256.png similarity index 100% rename from content/canvas/test/image_ggrr-256x256.png rename to dom/canvas/test/image_ggrr-256x256.png diff --git a/content/canvas/test/image_green-16x16.png b/dom/canvas/test/image_green-16x16.png similarity index 100% rename from content/canvas/test/image_green-16x16.png rename to dom/canvas/test/image_green-16x16.png diff --git a/content/canvas/test/image_green-1x1.png b/dom/canvas/test/image_green-1x1.png similarity index 100% rename from content/canvas/test/image_green-1x1.png rename to dom/canvas/test/image_green-1x1.png diff --git a/content/canvas/test/image_green-redirect b/dom/canvas/test/image_green-redirect similarity index 100% rename from content/canvas/test/image_green-redirect rename to dom/canvas/test/image_green-redirect diff --git a/dom/canvas/test/image_green-redirect^headers^ b/dom/canvas/test/image_green-redirect^headers^ new file mode 100644 index 000000000000..a5b6cb7446ed --- /dev/null +++ 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 b/dom/canvas/test/image_green.png similarity index 100% rename from content/canvas/test/image_green.png rename to dom/canvas/test/image_green.png diff --git a/content/canvas/test/image_red-16x16.png b/dom/canvas/test/image_red-16x16.png similarity index 100% rename from content/canvas/test/image_red-16x16.png rename to dom/canvas/test/image_red-16x16.png diff --git a/content/canvas/test/image_red.png b/dom/canvas/test/image_red.png similarity index 100% rename from content/canvas/test/image_red.png rename to dom/canvas/test/image_red.png diff --git a/content/canvas/test/image_redtransparent.png b/dom/canvas/test/image_redtransparent.png similarity index 100% rename from content/canvas/test/image_redtransparent.png rename to dom/canvas/test/image_redtransparent.png diff --git a/content/canvas/test/image_rgrg-256x256.png b/dom/canvas/test/image_rgrg-256x256.png similarity index 100% rename from content/canvas/test/image_rgrg-256x256.png rename to dom/canvas/test/image_rgrg-256x256.png diff --git a/content/canvas/test/image_rrgg-256x256.png b/dom/canvas/test/image_rrgg-256x256.png similarity index 100% rename from content/canvas/test/image_rrgg-256x256.png rename to dom/canvas/test/image_rrgg-256x256.png diff --git a/content/canvas/test/image_transparent.png b/dom/canvas/test/image_transparent.png similarity index 100% rename from content/canvas/test/image_transparent.png rename to dom/canvas/test/image_transparent.png diff --git a/content/canvas/test/image_transparent50.png b/dom/canvas/test/image_transparent50.png similarity index 100% rename from content/canvas/test/image_transparent50.png rename to dom/canvas/test/image_transparent50.png diff --git a/content/canvas/test/image_yellow.png b/dom/canvas/test/image_yellow.png similarity index 100% rename from content/canvas/test/image_yellow.png rename to dom/canvas/test/image_yellow.png diff --git a/content/canvas/test/image_yellow75.png b/dom/canvas/test/image_yellow75.png similarity index 100% rename from content/canvas/test/image_yellow75.png rename to dom/canvas/test/image_yellow75.png diff --git a/content/canvas/test/mochitest.ini b/dom/canvas/test/mochitest.ini similarity index 100% rename from content/canvas/test/mochitest.ini rename to dom/canvas/test/mochitest.ini diff --git a/content/canvas/test/moz.build b/dom/canvas/test/moz.build similarity index 100% rename from content/canvas/test/moz.build rename to dom/canvas/test/moz.build diff --git a/content/canvas/test/reftest/black.html b/dom/canvas/test/reftest/black.html similarity index 100% rename from content/canvas/test/reftest/black.html rename to dom/canvas/test/reftest/black.html diff --git a/content/canvas/test/reftest/clip-multiple-paths-badref.html b/dom/canvas/test/reftest/clip-multiple-paths-badref.html similarity index 100% rename from content/canvas/test/reftest/clip-multiple-paths-badref.html rename to dom/canvas/test/reftest/clip-multiple-paths-badref.html diff --git a/content/canvas/test/reftest/clip-multiple-paths.html b/dom/canvas/test/reftest/clip-multiple-paths.html similarity index 100% rename from content/canvas/test/reftest/clip-multiple-paths.html rename to dom/canvas/test/reftest/clip-multiple-paths.html diff --git a/content/canvas/test/reftest/colors-half-alpha.png b/dom/canvas/test/reftest/colors-half-alpha.png similarity index 100% rename from content/canvas/test/reftest/colors-half-alpha.png rename to dom/canvas/test/reftest/colors-half-alpha.png diff --git a/content/canvas/test/reftest/colors.png b/dom/canvas/test/reftest/colors.png similarity index 100% rename from content/canvas/test/reftest/colors.png rename to dom/canvas/test/reftest/colors.png diff --git a/content/canvas/test/reftest/drawCustomFocusRing-ref.html b/dom/canvas/test/reftest/drawCustomFocusRing-ref.html similarity index 100% rename from content/canvas/test/reftest/drawCustomFocusRing-ref.html rename to dom/canvas/test/reftest/drawCustomFocusRing-ref.html diff --git a/content/canvas/test/reftest/drawCustomFocusRing.html b/dom/canvas/test/reftest/drawCustomFocusRing.html similarity index 100% rename from content/canvas/test/reftest/drawCustomFocusRing.html rename to dom/canvas/test/reftest/drawCustomFocusRing.html diff --git a/content/canvas/test/reftest/drawFocusIfNeeded-ref.html b/dom/canvas/test/reftest/drawFocusIfNeeded-ref.html similarity index 100% rename from content/canvas/test/reftest/drawFocusIfNeeded-ref.html rename to dom/canvas/test/reftest/drawFocusIfNeeded-ref.html diff --git a/content/canvas/test/reftest/drawFocusIfNeeded.html b/dom/canvas/test/reftest/drawFocusIfNeeded.html similarity index 100% rename from content/canvas/test/reftest/drawFocusIfNeeded.html rename to dom/canvas/test/reftest/drawFocusIfNeeded.html diff --git a/content/canvas/test/reftest/green.png b/dom/canvas/test/reftest/green.png similarity index 100% rename from content/canvas/test/reftest/green.png rename to dom/canvas/test/reftest/green.png diff --git a/content/canvas/test/reftest/half-colors-half-alpha.png b/dom/canvas/test/reftest/half-colors-half-alpha.png similarity index 100% rename from content/canvas/test/reftest/half-colors-half-alpha.png rename to dom/canvas/test/reftest/half-colors-half-alpha.png diff --git a/content/canvas/test/reftest/half-colors.png b/dom/canvas/test/reftest/half-colors.png similarity index 100% rename from content/canvas/test/reftest/half-colors.png rename to dom/canvas/test/reftest/half-colors.png diff --git a/content/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list similarity index 100% rename from content/canvas/test/reftest/reftest.list rename to dom/canvas/test/reftest/reftest.list diff --git a/content/canvas/test/reftest/stroketext-shadow-ref.html b/dom/canvas/test/reftest/stroketext-shadow-ref.html similarity index 100% rename from content/canvas/test/reftest/stroketext-shadow-ref.html rename to dom/canvas/test/reftest/stroketext-shadow-ref.html diff --git a/content/canvas/test/reftest/stroketext-shadow.html b/dom/canvas/test/reftest/stroketext-shadow.html similarity index 100% rename from content/canvas/test/reftest/stroketext-shadow.html rename to dom/canvas/test/reftest/stroketext-shadow.html diff --git a/content/canvas/test/reftest/webgl-clear-test.html b/dom/canvas/test/reftest/webgl-clear-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-clear-test.html rename to dom/canvas/test/reftest/webgl-clear-test.html diff --git a/content/canvas/test/reftest/webgl-color-alpha-test.html b/dom/canvas/test/reftest/webgl-color-alpha-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-color-alpha-test.html rename to dom/canvas/test/reftest/webgl-color-alpha-test.html diff --git a/content/canvas/test/reftest/webgl-color-test.html b/dom/canvas/test/reftest/webgl-color-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-color-test.html rename to dom/canvas/test/reftest/webgl-color-test.html diff --git a/content/canvas/test/reftest/webgl-disable-test.html b/dom/canvas/test/reftest/webgl-disable-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-disable-test.html rename to dom/canvas/test/reftest/webgl-disable-test.html diff --git a/content/canvas/test/reftest/webgl-hanging-fb-test.html b/dom/canvas/test/reftest/webgl-hanging-fb-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-hanging-fb-test.html rename to dom/canvas/test/reftest/webgl-hanging-fb-test.html diff --git a/content/canvas/test/reftest/webgl-hanging-scissor-test.html b/dom/canvas/test/reftest/webgl-hanging-scissor-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-hanging-scissor-test.html rename to dom/canvas/test/reftest/webgl-hanging-scissor-test.html diff --git a/content/canvas/test/reftest/webgl-orientation-test.html b/dom/canvas/test/reftest/webgl-orientation-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-orientation-test.html rename to dom/canvas/test/reftest/webgl-orientation-test.html diff --git a/content/canvas/test/reftest/webgl-resize-test.html b/dom/canvas/test/reftest/webgl-resize-test.html similarity index 100% rename from content/canvas/test/reftest/webgl-resize-test.html rename to dom/canvas/test/reftest/webgl-resize-test.html diff --git a/content/canvas/test/reftest/webgl-utils.js b/dom/canvas/test/reftest/webgl-utils.js similarity index 100% rename from content/canvas/test/reftest/webgl-utils.js rename to dom/canvas/test/reftest/webgl-utils.js diff --git a/content/canvas/test/reftest/white-top-left.png b/dom/canvas/test/reftest/white-top-left.png similarity index 100% rename from content/canvas/test/reftest/white-top-left.png rename to dom/canvas/test/reftest/white-top-left.png diff --git a/content/canvas/test/reftest/white.png b/dom/canvas/test/reftest/white.png similarity index 100% rename from content/canvas/test/reftest/white.png rename to dom/canvas/test/reftest/white.png diff --git a/content/canvas/test/reftest/wrapper.html b/dom/canvas/test/reftest/wrapper.html similarity index 100% rename from content/canvas/test/reftest/wrapper.html rename to dom/canvas/test/reftest/wrapper.html diff --git a/content/canvas/test/test_2d.clearRect.image.offscreen.html b/dom/canvas/test/test_2d.clearRect.image.offscreen.html similarity index 100% rename from content/canvas/test/test_2d.clearRect.image.offscreen.html rename to dom/canvas/test/test_2d.clearRect.image.offscreen.html diff --git a/content/canvas/test/test_2d.clip.winding.html b/dom/canvas/test/test_2d.clip.winding.html similarity index 100% rename from content/canvas/test/test_2d.clip.winding.html rename to dom/canvas/test/test_2d.clip.winding.html diff --git a/content/canvas/test/test_2d.composite.canvas.color-burn.html b/dom/canvas/test/test_2d.composite.canvas.color-burn.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.color-burn.html rename to dom/canvas/test/test_2d.composite.canvas.color-burn.html diff --git a/content/canvas/test/test_2d.composite.canvas.color-dodge.html b/dom/canvas/test/test_2d.composite.canvas.color-dodge.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.color-dodge.html rename to dom/canvas/test/test_2d.composite.canvas.color-dodge.html diff --git a/content/canvas/test/test_2d.composite.canvas.color.html b/dom/canvas/test/test_2d.composite.canvas.color.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.color.html rename to dom/canvas/test/test_2d.composite.canvas.color.html diff --git a/content/canvas/test/test_2d.composite.canvas.darken.html b/dom/canvas/test/test_2d.composite.canvas.darken.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.darken.html rename to dom/canvas/test/test_2d.composite.canvas.darken.html diff --git a/content/canvas/test/test_2d.composite.canvas.destination-atop.html b/dom/canvas/test/test_2d.composite.canvas.destination-atop.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.destination-atop.html rename to dom/canvas/test/test_2d.composite.canvas.destination-atop.html diff --git a/content/canvas/test/test_2d.composite.canvas.destination-in.html b/dom/canvas/test/test_2d.composite.canvas.destination-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.destination-in.html rename to dom/canvas/test/test_2d.composite.canvas.destination-in.html diff --git a/content/canvas/test/test_2d.composite.canvas.difference.html b/dom/canvas/test/test_2d.composite.canvas.difference.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.difference.html rename to dom/canvas/test/test_2d.composite.canvas.difference.html diff --git a/content/canvas/test/test_2d.composite.canvas.exclusion.html b/dom/canvas/test/test_2d.composite.canvas.exclusion.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.exclusion.html rename to dom/canvas/test/test_2d.composite.canvas.exclusion.html diff --git a/content/canvas/test/test_2d.composite.canvas.hard-light.html b/dom/canvas/test/test_2d.composite.canvas.hard-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.hard-light.html rename to dom/canvas/test/test_2d.composite.canvas.hard-light.html diff --git a/content/canvas/test/test_2d.composite.canvas.hue.html b/dom/canvas/test/test_2d.composite.canvas.hue.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.hue.html rename to dom/canvas/test/test_2d.composite.canvas.hue.html diff --git a/content/canvas/test/test_2d.composite.canvas.lighten.html b/dom/canvas/test/test_2d.composite.canvas.lighten.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.lighten.html rename to dom/canvas/test/test_2d.composite.canvas.lighten.html diff --git a/content/canvas/test/test_2d.composite.canvas.lighter.html b/dom/canvas/test/test_2d.composite.canvas.lighter.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.lighter.html rename to dom/canvas/test/test_2d.composite.canvas.lighter.html diff --git a/content/canvas/test/test_2d.composite.canvas.luminosity.html b/dom/canvas/test/test_2d.composite.canvas.luminosity.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.luminosity.html rename to dom/canvas/test/test_2d.composite.canvas.luminosity.html diff --git a/content/canvas/test/test_2d.composite.canvas.multiply.html b/dom/canvas/test/test_2d.composite.canvas.multiply.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.multiply.html rename to dom/canvas/test/test_2d.composite.canvas.multiply.html diff --git a/content/canvas/test/test_2d.composite.canvas.overlay.html b/dom/canvas/test/test_2d.composite.canvas.overlay.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.overlay.html rename to dom/canvas/test/test_2d.composite.canvas.overlay.html diff --git a/content/canvas/test/test_2d.composite.canvas.saturation.html b/dom/canvas/test/test_2d.composite.canvas.saturation.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.saturation.html rename to dom/canvas/test/test_2d.composite.canvas.saturation.html diff --git a/content/canvas/test/test_2d.composite.canvas.screen.html b/dom/canvas/test/test_2d.composite.canvas.screen.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.screen.html rename to dom/canvas/test/test_2d.composite.canvas.screen.html diff --git a/content/canvas/test/test_2d.composite.canvas.soft-light.html b/dom/canvas/test/test_2d.composite.canvas.soft-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.soft-light.html rename to dom/canvas/test/test_2d.composite.canvas.soft-light.html diff --git a/content/canvas/test/test_2d.composite.canvas.source-in.html b/dom/canvas/test/test_2d.composite.canvas.source-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.source-in.html rename to dom/canvas/test/test_2d.composite.canvas.source-in.html diff --git a/content/canvas/test/test_2d.composite.canvas.source-out.html b/dom/canvas/test/test_2d.composite.canvas.source-out.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.source-out.html rename to dom/canvas/test/test_2d.composite.canvas.source-out.html diff --git a/content/canvas/test/test_2d.composite.canvas.xor.html b/dom/canvas/test/test_2d.composite.canvas.xor.html similarity index 100% rename from content/canvas/test/test_2d.composite.canvas.xor.html rename to dom/canvas/test/test_2d.composite.canvas.xor.html diff --git a/content/canvas/test/test_2d.composite.clip.lighter.html b/dom/canvas/test/test_2d.composite.clip.lighter.html similarity index 100% rename from content/canvas/test/test_2d.composite.clip.lighter.html rename to dom/canvas/test/test_2d.composite.clip.lighter.html diff --git a/content/canvas/test/test_2d.composite.clip.xor.html b/dom/canvas/test/test_2d.composite.clip.xor.html similarity index 100% rename from content/canvas/test/test_2d.composite.clip.xor.html rename to dom/canvas/test/test_2d.composite.clip.xor.html diff --git a/content/canvas/test/test_2d.composite.image.destination-atop.html b/dom/canvas/test/test_2d.composite.image.destination-atop.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.destination-atop.html rename to dom/canvas/test/test_2d.composite.image.destination-atop.html diff --git a/content/canvas/test/test_2d.composite.image.destination-in.html b/dom/canvas/test/test_2d.composite.image.destination-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.destination-in.html rename to dom/canvas/test/test_2d.composite.image.destination-in.html diff --git a/content/canvas/test/test_2d.composite.image.lighter.html b/dom/canvas/test/test_2d.composite.image.lighter.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.lighter.html rename to dom/canvas/test/test_2d.composite.image.lighter.html diff --git a/content/canvas/test/test_2d.composite.image.source-in.html b/dom/canvas/test/test_2d.composite.image.source-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.source-in.html rename to dom/canvas/test/test_2d.composite.image.source-in.html diff --git a/content/canvas/test/test_2d.composite.image.source-out.html b/dom/canvas/test/test_2d.composite.image.source-out.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.source-out.html rename to dom/canvas/test/test_2d.composite.image.source-out.html diff --git a/content/canvas/test/test_2d.composite.image.xor.html b/dom/canvas/test/test_2d.composite.image.xor.html similarity index 100% rename from content/canvas/test/test_2d.composite.image.xor.html rename to dom/canvas/test/test_2d.composite.image.xor.html diff --git a/content/canvas/test/test_2d.composite.solid.color-burn.html b/dom/canvas/test/test_2d.composite.solid.color-burn.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.color-burn.html rename to dom/canvas/test/test_2d.composite.solid.color-burn.html diff --git a/content/canvas/test/test_2d.composite.solid.color-dodge.html b/dom/canvas/test/test_2d.composite.solid.color-dodge.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.color-dodge.html rename to dom/canvas/test/test_2d.composite.solid.color-dodge.html diff --git a/content/canvas/test/test_2d.composite.solid.color.html b/dom/canvas/test/test_2d.composite.solid.color.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.color.html rename to dom/canvas/test/test_2d.composite.solid.color.html diff --git a/content/canvas/test/test_2d.composite.solid.darken.html b/dom/canvas/test/test_2d.composite.solid.darken.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.darken.html rename to dom/canvas/test/test_2d.composite.solid.darken.html diff --git a/content/canvas/test/test_2d.composite.solid.difference.html b/dom/canvas/test/test_2d.composite.solid.difference.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.difference.html rename to dom/canvas/test/test_2d.composite.solid.difference.html diff --git a/content/canvas/test/test_2d.composite.solid.exclusion.html b/dom/canvas/test/test_2d.composite.solid.exclusion.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.exclusion.html rename to dom/canvas/test/test_2d.composite.solid.exclusion.html diff --git a/content/canvas/test/test_2d.composite.solid.hard-light.html b/dom/canvas/test/test_2d.composite.solid.hard-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.hard-light.html rename to dom/canvas/test/test_2d.composite.solid.hard-light.html diff --git a/content/canvas/test/test_2d.composite.solid.hue.html b/dom/canvas/test/test_2d.composite.solid.hue.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.hue.html rename to dom/canvas/test/test_2d.composite.solid.hue.html diff --git a/content/canvas/test/test_2d.composite.solid.lighten.html b/dom/canvas/test/test_2d.composite.solid.lighten.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.lighten.html rename to dom/canvas/test/test_2d.composite.solid.lighten.html diff --git a/content/canvas/test/test_2d.composite.solid.lighter.html b/dom/canvas/test/test_2d.composite.solid.lighter.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.lighter.html rename to dom/canvas/test/test_2d.composite.solid.lighter.html diff --git a/content/canvas/test/test_2d.composite.solid.luminosity.html b/dom/canvas/test/test_2d.composite.solid.luminosity.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.luminosity.html rename to dom/canvas/test/test_2d.composite.solid.luminosity.html diff --git a/content/canvas/test/test_2d.composite.solid.multiply.html b/dom/canvas/test/test_2d.composite.solid.multiply.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.multiply.html rename to dom/canvas/test/test_2d.composite.solid.multiply.html diff --git a/content/canvas/test/test_2d.composite.solid.overlay.html b/dom/canvas/test/test_2d.composite.solid.overlay.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.overlay.html rename to dom/canvas/test/test_2d.composite.solid.overlay.html diff --git a/content/canvas/test/test_2d.composite.solid.saturation.html b/dom/canvas/test/test_2d.composite.solid.saturation.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.saturation.html rename to dom/canvas/test/test_2d.composite.solid.saturation.html diff --git a/content/canvas/test/test_2d.composite.solid.screen.html b/dom/canvas/test/test_2d.composite.solid.screen.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.screen.html rename to dom/canvas/test/test_2d.composite.solid.screen.html diff --git a/content/canvas/test/test_2d.composite.solid.soft-light.html b/dom/canvas/test/test_2d.composite.solid.soft-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.soft-light.html rename to dom/canvas/test/test_2d.composite.solid.soft-light.html diff --git a/content/canvas/test/test_2d.composite.solid.xor.html b/dom/canvas/test/test_2d.composite.solid.xor.html similarity index 100% rename from content/canvas/test/test_2d.composite.solid.xor.html rename to dom/canvas/test/test_2d.composite.solid.xor.html diff --git a/content/canvas/test/test_2d.composite.transparent.lighter.html b/dom/canvas/test/test_2d.composite.transparent.lighter.html similarity index 100% rename from content/canvas/test/test_2d.composite.transparent.lighter.html rename to dom/canvas/test/test_2d.composite.transparent.lighter.html diff --git a/content/canvas/test/test_2d.composite.transparent.xor.html b/dom/canvas/test/test_2d.composite.transparent.xor.html similarity index 100% rename from content/canvas/test/test_2d.composite.transparent.xor.html rename to dom/canvas/test/test_2d.composite.transparent.xor.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color-burn.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.color-burn.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.color-burn.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.color-dodge.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.color.html b/dom/canvas/test/test_2d.composite.uncovered.fill.color.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.color.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.color.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.darken.html b/dom/canvas/test/test_2d.composite.uncovered.fill.darken.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.darken.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.darken.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.fill.destination-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.destination-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.difference.html b/dom/canvas/test/test_2d.composite.uncovered.fill.difference.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.difference.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.difference.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html b/dom/canvas/test/test_2d.composite.uncovered.fill.exclusion.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.exclusion.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.exclusion.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html b/dom/canvas/test/test_2d.composite.uncovered.fill.hard-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.hard-light.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.hard-light.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.hue.html b/dom/canvas/test/test_2d.composite.uncovered.fill.hue.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.hue.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.hue.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.lighten.html b/dom/canvas/test/test_2d.composite.uncovered.fill.lighten.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.lighten.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.lighten.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html b/dom/canvas/test/test_2d.composite.uncovered.fill.luminosity.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.luminosity.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.luminosity.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.multiply.html b/dom/canvas/test/test_2d.composite.uncovered.fill.multiply.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.multiply.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.multiply.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.overlay.html b/dom/canvas/test/test_2d.composite.uncovered.fill.overlay.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.overlay.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.overlay.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.saturation.html b/dom/canvas/test/test_2d.composite.uncovered.fill.saturation.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.saturation.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.saturation.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.screen.html b/dom/canvas/test/test_2d.composite.uncovered.fill.screen.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.screen.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.screen.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html b/dom/canvas/test/test_2d.composite.uncovered.fill.soft-light.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.soft-light.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.soft-light.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.fill.source-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.source-in.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.source-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.fill.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.fill.source-out.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.fill.source-out.html rename to dom/canvas/test/test_2d.composite.uncovered.fill.source-out.html diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html rename to dom/canvas/test/test_2d.composite.uncovered.image.destination-atop.html diff --git a/content/canvas/test/test_2d.composite.uncovered.image.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.image.destination-in.html rename to dom/canvas/test/test_2d.composite.uncovered.image.destination-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.image.source-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.image.source-in.html rename to dom/canvas/test/test_2d.composite.uncovered.image.source-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.image.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.image.source-out.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.image.source-out.html rename to dom/canvas/test/test_2d.composite.uncovered.image.source-out.html diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html rename to dom/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html rename to dom/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.source-in.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html rename to dom/canvas/test/test_2d.composite.uncovered.pattern.source-in.html diff --git a/content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html b/dom/canvas/test/test_2d.composite.uncovered.pattern.source-out.html similarity index 100% rename from content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html rename to dom/canvas/test/test_2d.composite.uncovered.pattern.source-out.html diff --git a/content/canvas/test/test_2d.drawImage.zerocanvas.html b/dom/canvas/test/test_2d.drawImage.zerocanvas.html similarity index 100% rename from content/canvas/test/test_2d.drawImage.zerocanvas.html rename to dom/canvas/test/test_2d.drawImage.zerocanvas.html diff --git a/content/canvas/test/test_2d.fill.winding.html b/dom/canvas/test/test_2d.fill.winding.html similarity index 100% rename from content/canvas/test/test_2d.fill.winding.html rename to dom/canvas/test/test_2d.fill.winding.html diff --git a/content/canvas/test/test_2d.fillText.gradient.html b/dom/canvas/test/test_2d.fillText.gradient.html similarity index 100% rename from content/canvas/test/test_2d.fillText.gradient.html rename to dom/canvas/test/test_2d.fillText.gradient.html diff --git a/content/canvas/test/test_2d.gradient.radial.cone.behind.html b/dom/canvas/test/test_2d.gradient.radial.cone.behind.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.cone.behind.html rename to dom/canvas/test/test_2d.gradient.radial.cone.behind.html diff --git a/content/canvas/test/test_2d.gradient.radial.cone.beside.html b/dom/canvas/test/test_2d.gradient.radial.cone.beside.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.cone.beside.html rename to dom/canvas/test/test_2d.gradient.radial.cone.beside.html diff --git a/content/canvas/test/test_2d.gradient.radial.cone.front.html b/dom/canvas/test/test_2d.gradient.radial.cone.front.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.cone.front.html rename to dom/canvas/test/test_2d.gradient.radial.cone.front.html diff --git a/content/canvas/test/test_2d.gradient.radial.cone.shape2.html b/dom/canvas/test/test_2d.gradient.radial.cone.shape2.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.cone.shape2.html rename to dom/canvas/test/test_2d.gradient.radial.cone.shape2.html diff --git a/content/canvas/test/test_2d.gradient.radial.cone.top.html b/dom/canvas/test/test_2d.gradient.radial.cone.top.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.cone.top.html rename to dom/canvas/test/test_2d.gradient.radial.cone.top.html diff --git a/content/canvas/test/test_2d.gradient.radial.equal.html b/dom/canvas/test/test_2d.gradient.radial.equal.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.equal.html rename to dom/canvas/test/test_2d.gradient.radial.equal.html diff --git a/content/canvas/test/test_2d.gradient.radial.inside2.html b/dom/canvas/test/test_2d.gradient.radial.inside2.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.inside2.html rename to dom/canvas/test/test_2d.gradient.radial.inside2.html diff --git a/content/canvas/test/test_2d.gradient.radial.inside3.html b/dom/canvas/test/test_2d.gradient.radial.inside3.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.inside3.html rename to dom/canvas/test/test_2d.gradient.radial.inside3.html diff --git a/content/canvas/test/test_2d.gradient.radial.outside1.html b/dom/canvas/test/test_2d.gradient.radial.outside1.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.outside1.html rename to dom/canvas/test/test_2d.gradient.radial.outside1.html diff --git a/content/canvas/test/test_2d.gradient.radial.outside2.html b/dom/canvas/test/test_2d.gradient.radial.outside2.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.outside2.html rename to dom/canvas/test/test_2d.gradient.radial.outside2.html diff --git a/content/canvas/test/test_2d.gradient.radial.outside3.html b/dom/canvas/test/test_2d.gradient.radial.outside3.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.outside3.html rename to dom/canvas/test/test_2d.gradient.radial.outside3.html diff --git a/content/canvas/test/test_2d.gradient.radial.touch1.html b/dom/canvas/test/test_2d.gradient.radial.touch1.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.touch1.html rename to dom/canvas/test/test_2d.gradient.radial.touch1.html diff --git a/content/canvas/test/test_2d.gradient.radial.touch2.html b/dom/canvas/test/test_2d.gradient.radial.touch2.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.touch2.html rename to dom/canvas/test/test_2d.gradient.radial.touch2.html diff --git a/content/canvas/test/test_2d.gradient.radial.touch3.html b/dom/canvas/test/test_2d.gradient.radial.touch3.html similarity index 100% rename from content/canvas/test/test_2d.gradient.radial.touch3.html rename to dom/canvas/test/test_2d.gradient.radial.touch3.html diff --git a/content/canvas/test/test_2d.isPointInPath.winding.html b/dom/canvas/test/test_2d.isPointInPath.winding.html similarity index 100% rename from content/canvas/test/test_2d.isPointInPath.winding.html rename to dom/canvas/test/test_2d.isPointInPath.winding.html diff --git a/content/canvas/test/test_2d.line.cap.closed.html b/dom/canvas/test/test_2d.line.cap.closed.html similarity index 100% rename from content/canvas/test/test_2d.line.cap.closed.html rename to dom/canvas/test/test_2d.line.cap.closed.html diff --git a/content/canvas/test/test_2d.line.join.parallel.html b/dom/canvas/test/test_2d.line.join.parallel.html similarity index 100% rename from content/canvas/test/test_2d.line.join.parallel.html rename to dom/canvas/test/test_2d.line.join.parallel.html diff --git a/content/canvas/test/test_2d.path.arc.shape.3.html b/dom/canvas/test/test_2d.path.arc.shape.3.html similarity index 100% rename from content/canvas/test/test_2d.path.arc.shape.3.html rename to dom/canvas/test/test_2d.path.arc.shape.3.html diff --git a/content/canvas/test/test_2d.path.rect.selfintersect.html b/dom/canvas/test/test_2d.path.rect.selfintersect.html similarity index 100% rename from content/canvas/test/test_2d.path.rect.selfintersect.html rename to dom/canvas/test/test_2d.path.rect.selfintersect.html diff --git a/content/canvas/test/test_2d.path.rect.zero.6.html b/dom/canvas/test/test_2d.path.rect.zero.6.html similarity index 100% rename from content/canvas/test/test_2d.path.rect.zero.6.html rename to dom/canvas/test/test_2d.path.rect.zero.6.html diff --git a/content/canvas/test/test_2d.strokeRect.zero.5.html b/dom/canvas/test/test_2d.strokeRect.zero.5.html similarity index 100% rename from content/canvas/test/test_2d.strokeRect.zero.5.html rename to dom/canvas/test/test_2d.strokeRect.zero.5.html diff --git a/content/canvas/test/test_2d_composite_canvaspattern_setTransform.html b/dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html similarity index 100% rename from content/canvas/test/test_2d_composite_canvaspattern_setTransform.html rename to dom/canvas/test/test_2d_composite_canvaspattern_setTransform.html diff --git a/content/canvas/test/test_ImageData_ctor.html b/dom/canvas/test/test_ImageData_ctor.html similarity index 100% rename from content/canvas/test/test_ImageData_ctor.html rename to dom/canvas/test/test_ImageData_ctor.html diff --git a/content/canvas/test/test_bug613794.html b/dom/canvas/test/test_bug613794.html similarity index 100% rename from content/canvas/test/test_bug613794.html rename to dom/canvas/test/test_bug613794.html diff --git a/content/canvas/test/test_bug753758.html b/dom/canvas/test/test_bug753758.html similarity index 100% rename from content/canvas/test/test_bug753758.html rename to dom/canvas/test/test_bug753758.html diff --git a/content/canvas/test/test_bug764125.html b/dom/canvas/test/test_bug764125.html similarity index 100% rename from content/canvas/test/test_bug764125.html rename to dom/canvas/test/test_bug764125.html diff --git a/content/canvas/test/test_bug856472.html b/dom/canvas/test/test_bug856472.html similarity index 100% rename from content/canvas/test/test_bug856472.html rename to dom/canvas/test/test_bug856472.html diff --git a/content/canvas/test/test_bug866575.html b/dom/canvas/test/test_bug866575.html similarity index 100% rename from content/canvas/test/test_bug866575.html rename to dom/canvas/test/test_bug866575.html diff --git a/content/canvas/test/test_bug902651.html b/dom/canvas/test/test_bug902651.html similarity index 100% rename from content/canvas/test/test_bug902651.html rename to dom/canvas/test/test_bug902651.html diff --git a/content/canvas/test/test_canvas.html b/dom/canvas/test/test_canvas.html similarity index 99% rename from content/canvas/test/test_canvas.html rename to dom/canvas/test/test_canvas.html index 4609b8832542..6a241fcf756e 100644 --- a/content/canvas/test/test_canvas.html +++ b/dom/canvas/test/test_canvas.html @@ -81,7 +81,7 @@ } - + @@ -19594,7 +19594,7 @@ - +