Bug 903819 - Don't include Layers.h everywhere, part 4 r=nrc

Brli · Aug 20, 2013 · bf5c77a · bf5c77a
1 parent bc57cc7
commit bf5c77a
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 21 deletions.
diff --git a/content/html/content/src/HTMLAnchorElement.h b/content/html/content/src/HTMLAnchorElement.h
@@ -9,6 +9,7 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/Link.h"
+#include "nsContentUtils.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLAnchorElement.h"
 

diff --git a/content/media/MediaDecoderReader.h b/content/media/MediaDecoderReader.h
@@ -11,7 +11,6 @@
 #include "mozilla/ReentrantMonitor.h"
 #include "MediaStreamGraph.h"
 #include "SharedBuffer.h"
-#include "ImageLayers.h"
 #include "AudioSampleFormat.h"
 #include "MediaResource.h"
 #include "mozilla/dom/HTMLMediaElement.h"

diff --git a/content/media/dash/DASHRepDecoder.h b/content/media/dash/DASHRepDecoder.h
@@ -16,14 +16,17 @@
 #define DASHRepDecoder_h_
 
 #include "Representation.h"
-#include "ImageLayers.h"
 #include "DASHDecoder.h"
 #include "WebMDecoder.h"
 #include "WebMReader.h"
 #include "MediaDecoder.h"
 
 namespace mozilla {
 
+namespace layers {
+class ImageContainer;
+}
+
 class DASHDecoder;
 class DASHRepReader;
 

diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
@@ -55,6 +55,7 @@ class PCompositorParent;
 
 namespace dom {
 
+class Element;
 class TabParent;
 class PStorageParent;
 class ClonedMessageData;

diff --git a/gfx/ipc/GfxMessageUtils.h b/gfx/ipc/GfxMessageUtils.h
@@ -27,7 +27,6 @@
 #include "mozilla/layers/LayersTypes.h"
 #include "mozilla/layers/CompositorTypes.h"
 #include "FrameMetrics.h"
-#include "ImageLayers.h"
 
 #ifdef _MSC_VER
 #pragma warning( disable : 4800 )
@@ -39,7 +38,6 @@ typedef gfxASurface::gfxContentType gfxContentType;
 typedef gfxASurface::gfxImageFormat PixelFormat;
 typedef gfxASurface::gfxSurfaceType gfxSurfaceType;
 typedef gfxPattern::GraphicsFilter GraphicsFilterType;
-typedef layers::ImageLayer::ScaleMode ScaleMode;
 
 } // namespace mozilla
 
@@ -216,10 +214,10 @@ struct ParamTraits<mozilla::layers::LayersBackend>
 {};
 
 template <>
-struct ParamTraits<mozilla::ScaleMode>
-  : public EnumSerializer<mozilla::ScaleMode,
-                          mozilla::layers::ImageLayer::SCALE_NONE,
-                          mozilla::layers::ImageLayer::SCALE_SENTINEL>
+struct ParamTraits<mozilla::layers::ScaleMode>
+  : public EnumSerializer<mozilla::layers::ScaleMode,
+                          mozilla::layers::SCALE_NONE,
+                          mozilla::layers::SCALE_SENTINEL>
 {};
 
 template <>

diff --git a/gfx/layers/Compositor.h b/gfx/layers/Compositor.h
@@ -9,9 +9,9 @@
 #include "mozilla/gfx/Rect.h"
 #include "mozilla/gfx/Matrix.h"
 #include "gfxMatrix.h"
-#include "Layers.h"
 #include "mozilla/RefPtr.h"
 #include "mozilla/layers/CompositorTypes.h"
+#include "Units.h"
 
 /**
  * Different elements of a web pages are rendered into separate "layers" before

diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
@@ -22,13 +22,6 @@ class ImageContainer;
  */
 class ImageLayer : public Layer {
 public:
-  enum ScaleMode {
-    SCALE_NONE,
-    SCALE_STRETCH,
-    SCALE_SENTINEL
-  // Unimplemented - SCALE_PRESERVE_ASPECT_RATIO_CONTAIN
-  };
-
   /**
    * CONSTRUCTION PHASE ONLY
    * Set the ImageContainer. aContainer must have the same layer manager

diff --git a/gfx/layers/LayerTreeInvalidation.cpp b/gfx/layers/LayerTreeInvalidation.cpp
@@ -335,7 +335,7 @@ struct ImageLayerProperties : public LayerPropertiesBase
   nsRefPtr<ImageContainer> mContainer;
   gfxPattern::GraphicsFilter mFilter;
   gfxIntSize mScaleToSize;
-  ImageLayer::ScaleMode mScaleMode;
+  ScaleMode mScaleMode;
 };
 
 LayerPropertiesBase*

diff --git a/gfx/layers/LayersTypes.h b/gfx/layers/LayersTypes.h
@@ -111,6 +111,13 @@ struct LayerRenderState {
   bool mHasOwnOffset;
 };
 
+enum ScaleMode {
+  SCALE_NONE,
+  SCALE_STRETCH,
+  SCALE_SENTINEL
+// Unimplemented - SCALE_PRESERVE_ASPECT_RATIO_CONTAIN
+};
+
 } // namespace
 } // namespace
 

diff --git a/gfx/layers/YCbCrImageDataSerializer.h b/gfx/layers/YCbCrImageDataSerializer.h
@@ -12,6 +12,7 @@
 #include "base/basictypes.h"
 #include "Shmem.h"
 #include "gfxPoint.h"
+#include "ImageTypes.h"
 
 namespace mozilla {
 namespace ipc {

diff --git a/gfx/layers/ipc/LayerTransaction.ipdlh b/gfx/layers/ipc/LayerTransaction.ipdlh
@@ -33,7 +33,7 @@ using mozilla::dom::ScreenOrientation;
 using mozilla::layers::TextureInfo;
 using mozilla::LayerMargin;
 using mozilla::LayerPoint;
-using mozilla::layers::ImageLayer::ScaleMode;
+using mozilla::layers::ScaleMode;
 using mozilla::layers::DiagnosticTypes;
 
 namespace mozilla {

diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp
@@ -1617,7 +1617,7 @@ nsObjectFrame::BuildLayer(nsDisplayListBuilder* aBuilder,
     }
 #endif
 
-    imglayer->SetScaleToSize(size, ImageLayer::SCALE_STRETCH);
+    imglayer->SetScaleToSize(size, SCALE_STRETCH);
     imglayer->SetContainer(container);
     gfxPattern::GraphicsFilter filter =
       nsLayoutUtils::GetGraphicsFilterForFrame(this);

diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
@@ -30,9 +30,7 @@
 
 #ifdef MOZILLA_INTERNAL_API
 #include "mozilla/net/DataChannel.h"
-#include "Layers.h"
 #include "VideoUtils.h"
-#include "ImageLayers.h"
 #include "VideoSegment.h"
 #include "nsNSSShutDown.h"
 #else

diff --git a/view/src/nsViewManager.cpp b/view/src/nsViewManager.cpp
@@ -25,6 +25,7 @@
 #include "mozilla/Preferences.h"
 #include "nsContentUtils.h" // for nsAutoScriptBlocker
 #include "nsLayoutUtils.h"
+#include "Layers.h"
 #include "mozilla/layers/Compositor.h"
 
 /**