Bug 907595: Forward declare ImageData and stop including it in headers. r=bz

content/canvas/src/CanvasRenderingContext2D.h

@@ -16,7 +16,6 @@
 #include "CanvasUtils.h"
 #include "gfxFont.h"
 #include "mozilla/ErrorResult.h"
-#include "mozilla/dom/ImageData.h"
 #include "mozilla/dom/CanvasGradient.h"
 #include "mozilla/dom/CanvasRenderingContext2DBinding.h"
 #include "mozilla/dom/CanvasPattern.h"
@@ -31,6 +30,7 @@ class SourceSurface;
 
 namespace dom {
 class HTMLImageElementOrHTMLCanvasElementOrHTMLVideoElement;
+class ImageData;
 class StringOrCanvasGradientOrCanvasPattern;
 class StringOrCanvasGradientOrCanvasPatternReturnValue;
 class TextMetrics;

content/canvas/src/WebGLContext.cpp

@@ -52,6 +52,7 @@
 #include "mozilla/Services.h"
 #include "mozilla/dom/WebGLRenderingContextBinding.h"
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/ImageData.h"
 #include "mozilla/ProcessPriorityManager.h"
 
 #include "Layers.h"

content/canvas/src/WebGLContext.h

@@ -25,7 +25,6 @@
 
 #include "mozilla/LinkedList.h"
 #include "mozilla/CheckedInt.h"
-#include "mozilla/dom/ImageData.h"
 
 #ifdef XP_MACOSX
 #include "ForceDiscreteGPUHelperCGL.h"
@@ -73,6 +72,8 @@ class WebGLTexture;
 class WebGLVertexArray;
 
 namespace dom {
+class ImageData;
+
 struct WebGLContextAttributes;
 struct WebGLContextAttributesInitializer;
 template<typename> class Nullable;

content/canvas/src/WebGLContextGL.cpp

@@ -42,6 +42,7 @@
 #endif
 
 #include "mozilla/dom/BindingUtils.h"
+#include "mozilla/dom/ImageData.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;