Issue #80 - De-unify dom/canvas

17 files changed, 49 insertions, 4 deletions

diff --git a/dom/canvas/CanvasImageCache.cpp b/dom/canvas/CanvasImageCache.cpp
index 82b3f277c..2e4e90d33 100644
--- a/dom/canvas/CanvasImageCache.cpp
+++ b/dom/canvas/CanvasImageCache.cpp
@@ -7,6 +7,7 @@
 #include "nsAutoPtr.h"
 #include "nsIImageLoadingContent.h"
 #include "nsExpirationTracker.h"
+#include "imgIContainer.h"
 #include "imgIRequest.h"
 #include "mozilla/dom/Element.h"
 #include "nsTHashtable.h"
diff --git a/dom/canvas/CanvasRenderingContextHelper.cpp b/dom/canvas/CanvasRenderingContextHelper.cpp
index 61317fb51..229801ffa 100644
--- a/dom/canvas/CanvasRenderingContextHelper.cpp
+++ b/dom/canvas/CanvasRenderingContextHelper.cpp
@@ -4,6 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "CanvasRenderingContextHelper.h"
+
+#include "CanvasUtils.h"
 #include "ImageBitmapRenderingContext.h"
 #include "ImageEncoder.h"
 #include "mozilla/dom/CanvasRenderingContext2D.h"
diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp
index 6efe1b318..e4b145d46 100644
--- a/dom/canvas/ImageBitmap.cpp
+++ b/dom/canvas/ImageBitmap.cpp
@@ -5,19 +5,29 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/ImageBitmap.h"
+
 #include "mozilla/CheckedInt.h"
+#include "mozilla/dom/File.h" // for Blob
+#include "mozilla/dom/HTMLImageElement.h"
 #include "mozilla/dom/ImageBitmapBinding.h"
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/StructuredCloneTags.h"
+#include "mozilla/dom/UnionTypes.h" // for ArrayBufferViewOrArrayBuffer
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
-#include "mozilla/gfx/2D.h"
+#include "CanvasRenderingContext2D.h"
+#include "gfxUtils.h"
 #include "ImageBitmapColorUtils.h"
 #include "ImageBitmapUtils.h"
+#include "ImageData.h"
+#include "ImageLayers.h"
 #include "ImageUtils.h"
 #include "imgTools.h"
 #include "libyuv.h"
+#include "nsLayoutUtils.h"
+#include "OffscreenCanvas.h"
 
+using namespace mozilla::dom;
 using namespace mozilla::gfx;
 using namespace mozilla::layers;
 
diff --git a/dom/canvas/ImageBitmap.h b/dom/canvas/ImageBitmap.h
index 25084b6ac..22953e541 100644
--- a/dom/canvas/ImageBitmap.h
+++ b/dom/canvas/ImageBitmap.h
@@ -13,7 +13,9 @@
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/Maybe.h"
 #include "mozilla/UniquePtr.h"
+#include "CanvasRenderingContextHelper.h"
 #include "nsCycleCollectionParticipant.h"
+#include "nsIGlobalObject.h"
 
 struct JSContext;
 struct JSStructuredCloneReader;
diff --git a/dom/canvas/ImageBitmapColorUtils.cpp b/dom/canvas/ImageBitmapColorUtils.cpp
index 2b65c1f10..4ef4ade86 100644
--- a/dom/canvas/ImageBitmapColorUtils.cpp
+++ b/dom/canvas/ImageBitmapColorUtils.cpp
@@ -6,6 +6,9 @@
 
 #include "ImageBitmapColorUtils.h"
 
+#include "js/LegacyIntTypes.h"
+#include <cmath>
+
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/canvas/ImageBitmapRenderingContext.cpp b/dom/canvas/ImageBitmapRenderingContext.cpp
index ad313906a..9c7af2522 100644
--- a/dom/canvas/ImageBitmapRenderingContext.cpp
+++ b/dom/canvas/ImageBitmapRenderingContext.cpp
@@ -4,9 +4,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "ImageBitmapRenderingContext.h"
+
 #include "mozilla/dom/ImageBitmapRenderingContextBinding.h"
+#include "mozilla/gfx/2D.h"
+#include "mozilla/gfx/DataSurfaceHelpers.h"
+#include "ImageBitmap.h"
 #include "ImageContainer.h"
+#include "ImageEncoder.h"
 #include "ImageLayers.h"
+#include "imgIEncoder.h"
+#include "Layers.h"
+
+using namespace mozilla::gfx;
+using namespace mozilla::layers;
 
 namespace mozilla {
 namespace dom {
diff --git a/dom/canvas/ImageBitmapUtils.h b/dom/canvas/ImageBitmapUtils.h
index 39be43d8a..bc8d6ad15 100644
--- a/dom/canvas/ImageBitmapUtils.h
+++ b/dom/canvas/ImageBitmapUtils.h
@@ -7,6 +7,7 @@
 #ifndef mozilla_dom_ImageBitmapUtils_h
 #define mozilla_dom_ImageBitmapUtils_h
 
+#include "ImageBitmap.h"
 #include "mozilla/UniquePtr.h"
 #include "nsTArrayForwardDeclare.h"
 
diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp
index 0d188c24e..981faf1b1 100644
--- a/dom/canvas/OffscreenCanvas.cpp
+++ b/dom/canvas/OffscreenCanvas.cpp
@@ -6,6 +6,9 @@
 
 #include "OffscreenCanvas.h"
 
+#include "mozilla/dom/File.h" // for Blob
+#include "mozilla/dom/ImageEncoder.h"
+#include "mozilla/dom/Promise.h"
 #include "mozilla/dom/OffscreenCanvasBinding.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerScope.h"
@@ -15,10 +18,15 @@
 #include "mozilla/Telemetry.h"
 #include "CanvasRenderingContext2D.h"
 #include "CanvasUtils.h"
+#include "GLContext.h"
 #include "GLScreenBuffer.h"
+#include "ImageBitmap.h"
 #include "WebGL1Context.h"
 #include "WebGL2Context.h"
 
+using namespace mozilla::layers;
+using namespace mozilla::dom::workers;
+ 
 namespace mozilla {
 namespace dom {
 
diff --git a/dom/canvas/WebGL2ContextUniforms.cpp b/dom/canvas/WebGL2ContextUniforms.cpp
index 7f8c07332..900f845fd 100644
--- a/dom/canvas/WebGL2ContextUniforms.cpp
+++ b/dom/canvas/WebGL2ContextUniforms.cpp
@@ -11,6 +11,7 @@
 #include "WebGLBuffer.h"
 #include "WebGLContext.h"
 #include "WebGLProgram.h"
+#include "WebGLTransformFeedback.h"
 #include "WebGLUniformLocation.h"
 #include "WebGLVertexArray.h"
 #include "WebGLVertexAttribData.h"
diff --git a/dom/canvas/WebGLContextBuffers.cpp b/dom/canvas/WebGLContextBuffers.cpp
index f53f9d7d7..e787b9914 100644
--- a/dom/canvas/WebGLContextBuffers.cpp
+++ b/dom/canvas/WebGLContextBuffers.cpp
@@ -7,6 +7,7 @@
 
 #include "GLContext.h"
 #include "WebGLBuffer.h"
+#include "WebGLTransformFeedback.h"
 #include "WebGLVertexArray.h"
 
 #include "mozilla/CheckedInt.h"
diff --git a/dom/canvas/WebGLContextVertices.cpp b/dom/canvas/WebGLContextVertices.cpp
index ba3156693..5daf1102a 100644
--- a/dom/canvas/WebGLContextVertices.cpp
+++ b/dom/canvas/WebGLContextVertices.cpp
@@ -7,6 +7,7 @@
 
 #include "GLContext.h"
 #include "mozilla/CheckedInt.h"
+#include "WebGL2Context.h"
 #include "WebGLBuffer.h"
 #include "WebGLFramebuffer.h"
 #include "WebGLProgram.h"
diff --git a/dom/canvas/WebGLExtensionDebugGet.cpp b/dom/canvas/WebGLExtensionDebugGet.cpp
index 39bb3c57a..a849bd17e 100644
--- a/dom/canvas/WebGLExtensionDebugGet.cpp
+++ b/dom/canvas/WebGLExtensionDebugGet.cpp
@@ -6,6 +6,7 @@
 #include "WebGLExtensions.h"
 
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
+#include "GLContext.h"
 #include "WebGLContext.h"
 #include "WebGLContextUtils.h"
 
diff --git a/dom/canvas/WebGLObjectModel.h b/dom/canvas/WebGLObjectModel.h
index 6371c7b03..7c6caf2c4 100644
--- a/dom/canvas/WebGLObjectModel.h
+++ b/dom/canvas/WebGLObjectModel.h
@@ -15,7 +15,6 @@ namespace mozilla {
 template<typename> class LinkedList;
 class WebGLContext;
 
-
 ////
 
 // This class is a mixin for objects that are tied to a specific
diff --git a/dom/canvas/WebGLSampler.h b/dom/canvas/WebGLSampler.h
index 1cf039984..73e550dfe 100644
--- a/dom/canvas/WebGLSampler.h
+++ b/dom/canvas/WebGLSampler.h
@@ -8,6 +8,7 @@
 
 #include "mozilla/LinkedList.h"
 #include "nsWrapperCache.h"
+#include "WebGLContext.h"
 #include "WebGLObjectModel.h"
 #include "WebGLStrongTypes.h"
 
diff --git a/dom/canvas/WebGLTransformFeedback.h b/dom/canvas/WebGLTransformFeedback.h
index aa57372a5..378794b9f 100644
--- a/dom/canvas/WebGLTransformFeedback.h
+++ b/dom/canvas/WebGLTransformFeedback.h
@@ -6,8 +6,11 @@
 #ifndef WEBGL_TRANSFORM_FEEDBACK_H_
 #define WEBGL_TRANSFORM_FEEDBACK_H_
 
+#include <vector>
 #include "mozilla/LinkedList.h"
 #include "nsWrapperCache.h"
+#include "WebGLBuffer.h"
+#include "WebGLContext.h"
 #include "WebGLObjectModel.h"
 
 namespace mozilla {
diff --git a/dom/canvas/WebGLVertexAttribData.h b/dom/canvas/WebGLVertexAttribData.h
index 9d79b4f94..6318b06d2 100644
--- a/dom/canvas/WebGLVertexAttribData.h
+++ b/dom/canvas/WebGLVertexAttribData.h
@@ -7,6 +7,7 @@
 #define WEBGL_VERTEX_ATTRIB_DATA_H_
 
 #include "GLDefs.h"
+#include "WebGLBuffer.h"
 #include "WebGLObjectModel.h"
 
 namespace mozilla {
diff --git a/dom/canvas/moz.build b/dom/canvas/moz.build
index 6d5e2756f..fe39425ec 100644
--- a/dom/canvas/moz.build
+++ b/dom/canvas/moz.build
@@ -42,7 +42,7 @@ EXPORTS.mozilla.dom += [
 ]
 
 # Canvas 2D and common sources
-UNIFIED_SOURCES += [
+SOURCES += [
     'CanvasImageCache.cpp',
     'CanvasRenderingContext2D.cpp',
     'CanvasRenderingContextHelper.cpp',
@@ -60,7 +60,7 @@ SOURCES += [
 ]
 
 # WebGL Sources
-UNIFIED_SOURCES += [
+SOURCES += [
     'TexUnpackBlob.cpp',
     'WebGL1Context.cpp',
     'WebGL1ContextUniforms.cpp',