Bug 903816. Fixups in non-layers files. r=roc

dom/base/nsDOMWindowUtils.cpp

@@ -60,6 +60,7 @@
 #endif
 
 #include "Layers.h"
+#include "mozilla/layers/ShadowLayers.h"
 #include "nsIIOService.h"
 
 #include "mozilla/dom/Element.h"

dom/ipc/TabChild.cpp

@@ -23,6 +23,7 @@
 #include "mozilla/layers/CompositorChild.h"
 #include "mozilla/layers/ImageBridgeChild.h"
 #include "mozilla/layers/PLayerTransactionChild.h"
+#include "mozilla/layers/ShadowLayers.h"
 #include "mozilla/layout/RenderFrameChild.h"
 #include "mozilla/StaticPtr.h"
 #include "mozilla/unused.h"

gfx/2d/BasePoint3D.h

@@ -6,6 +6,8 @@
 #ifndef MOZILLA_BASEPOINT3D_H_
 #define MOZILLA_BASEPOINT3D_H_
 
+#include "nsDebug.h"
+
 namespace mozilla {
 namespace gfx {
 

gfx/2d/Point.h

@@ -9,6 +9,8 @@
 #include "Types.h"
 #include "BasePoint.h"
 #include "BaseSize.h"
+#include "nsMathUtils.h"                // for NS_lround
+
 
 namespace mozilla {
 namespace gfx {

gfx/gl/GLTextureImage.cpp

@@ -42,6 +42,21 @@ TextureImage::UpdateFromDataSource(gfx::DataSourceSurface *aSurface,
     return DirectUpdate(thebesSurf, destRegion, thebesSrcPoint);
 }
 
+BasicTextureImage::BasicTextureImage(GLuint aTexture,
+                                     const nsIntSize& aSize,
+                                     GLenum aWrapMode,
+                                     ContentType aContentType,
+                                     GLContext* aContext,
+                                     TextureImage::Flags aFlags /* = TextureImage::NoFlags */,
+                                     TextureImage::ImageFormat aImageFormat /* = gfxASurface::ImageFormatUnknown */)
+    : TextureImage(aSize, aWrapMode, aContentType, aFlags, aImageFormat)
+    , mTexture(aTexture)
+    , mTextureState(Created)
+    , mGLContext(aContext)
+    , mUpdateOffset(0, 0)
+{
+}
+
 BasicTextureImage::~BasicTextureImage()
 {
     GLContext *ctx = mGLContext;

gfx/gl/GLTextureImage.h

@@ -298,13 +298,7 @@ public:
                       ContentType aContentType,
                       GLContext* aContext,
                       TextureImage::Flags aFlags = TextureImage::NoFlags,
-                      TextureImage::ImageFormat aImageFormat = gfxASurface::ImageFormatUnknown)
-        : TextureImage(aSize, aWrapMode, aContentType, aFlags, aImageFormat)
-        , mTexture(aTexture)
-        , mTextureState(Created)
-        , mGLContext(aContext)
-        , mUpdateOffset(0, 0)
-    {}
+                      TextureImage::ImageFormat aImageFormat = gfxASurface::ImageFormatUnknown);
 
     virtual void BindTexture(GLenum aTextureUnit);
 

gfx/layers/d3d10/ReadbackManagerD3D10.cpp

@@ -10,6 +10,7 @@
 #include "nsIThread.h"
 #include "nsThreadUtils.h"
 #include "gfxImageSurface.h"
+#include "gfxContext.h"
 
 namespace mozilla {
 namespace layers {

gfx/thebes/gfxBaseSharedMemorySurface.h

@@ -9,10 +9,10 @@
 
 #include "mozilla/ipc/Shmem.h"
 #include "mozilla/ipc/SharedMemory.h"
+#include "cairo/cairo.h"
 
 #include "gfxASurface.h"
 #include "gfxImageSurface.h"
-#include "cairo.h"
 
 struct SharedImageInfo {
     int32_t width;

gfx/thebes/gfxPlatform.h

@@ -17,6 +17,7 @@
 
 #include "qcms.h"
 
+#include "mozilla/gfx/2D.h"
 #include "gfx2DGlue.h"
 #include "mozilla/RefPtr.h"
 #include "GfxInfoCollector.h"

widget/gtk2/nsWindow.cpp

@@ -109,6 +109,7 @@ extern "C" {
 #include "Layers.h"
 #include "LayerManagerOGL.h"
 #include "GLContextProvider.h"
+#include "mozilla/gfx/2D.h"
 
 #ifdef MOZ_X11
 #include "gfxXlibSurface.h"
@@ -122,6 +123,7 @@ extern "C" {
 #include "nsWindow.h"
 
 using namespace mozilla;
+using namespace mozilla::gfx;
 using namespace mozilla::widget;
 using namespace mozilla::layers;
 using mozilla::gl::GLContext;
@@ -5962,7 +5964,7 @@ nsWindow::GetSurfaceForGdkDrawable(GdkDrawable* aDrawable,
 #endif
 
 #if defined(MOZ_WIDGET_GTK2)
-TemporaryRef<gfx::DrawTarget>
+TemporaryRef<DrawTarget>
 nsWindow::StartRemoteDrawing()
 {
   gfxASurface *surf = GetThebesSurface();
@@ -5970,7 +5972,7 @@ nsWindow::StartRemoteDrawing()
     return nullptr;
   }
 
-  gfx::IntSize size(surf->GetSize().width, surf->GetSize().height);
+  IntSize size(surf->GetSize().width, surf->GetSize().height);
   if (size.width <= 0 || size.height <= 0) {
     return nullptr;
   }

widget/gtk2/nsWindow.h

@@ -36,6 +36,7 @@
 
 #include "nsGtkIMModule.h"
 
+#undef LOG
 #ifdef MOZ_LOGGING
 
 // make sure that logging is enabled before including prlog.h

widget/windows/nsWindow.cpp

@@ -73,6 +73,7 @@
 #include "prtime.h"
 #include "prprf.h"
 #include "prmem.h"
+#include "prenv.h"
 
 #include "mozilla/WidgetTraceEvent.h"
 #include "nsIAppShell.h"

xpcom/glue/nsThreadUtils.h

@@ -9,6 +9,7 @@
 
 #include "prthread.h"
 #include "prinrval.h"
+#include "nscore.h"
 #include "nsIThreadManager.h"
 #include "nsIThread.h"
 #include "nsIRunnable.h"