Bug 1048752. Part 10: Remove FrameLayerBuilder.h from nsDisplayList.h. r=tn

I was inspired by the previous patch to remove FrameLayerBuilder.h from
nsDisplayList.h too.

--HG--
extra : rebase_source : b34a01bea5865da4737817e2396b98d54cc6d1bf

layout/base/FrameLayerBuilder.h

@@ -14,6 +14,7 @@
 #include "ImageLayers.h"
 #include "DisplayItemClip.h"
 #include "mozilla/layers/LayersTypes.h"
+#include "LayerState.h"
 
 class nsDisplayListBuilder;
 class nsDisplayList;
@@ -38,19 +39,6 @@ class LayerManagerData;
 class ThebesLayerData;
 class ContainerState;
 
-enum LayerState {
-  LAYER_NONE,
-  LAYER_INACTIVE,
-  LAYER_ACTIVE,
-  // Force an active layer even if it causes incorrect rendering, e.g.
-  // when the layer has rounded rect clips.
-  LAYER_ACTIVE_FORCE,
-  // Special layer that is metadata only.
-  LAYER_ACTIVE_EMPTY,
-  // Inactive style layer for rendering SVG effects.
-  LAYER_SVG_EFFECTS
-};
-
 class RefCountedRegion {
 private:
   ~RefCountedRegion() {}

layout/base/LayerState.h

@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 20; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+#ifndef LAYERSTATE_H_
+#define LAYERSTATE_H_
+
+namespace mozilla {
+
+enum LayerState {
+  LAYER_NONE,
+  LAYER_INACTIVE,
+  LAYER_ACTIVE,
+  // Force an active layer even if it causes incorrect rendering, e.g.
+  // when the layer has rounded rect clips.
+  LAYER_ACTIVE_FORCE,
+  // Special layer that is metadata only.
+  LAYER_ACTIVE_EMPTY,
+  // Inactive style layer for rendering SVG effects.
+  LAYER_SVG_EFFECTS
+};
+
+}
+
+#endif

layout/base/moz.build

@@ -21,6 +21,7 @@ EXPORTS += [
     'DisplayListClipState.h',
     'FrameLayerBuilder.h',
     'FramePropertyTable.h',
+    'LayerState.h',
     'nsArenaMemoryStats.h',
     'nsBidi.h',
     'nsBidiPresUtils.h',

layout/base/nsDisplayList.cpp

@@ -55,6 +55,7 @@
 #include "nsPrintfCString.h"
 #include "UnitTransforms.h"
 #include "LayersLogging.h"
+#include "FrameLayerBuilder.h"
 
 #include <stdint.h>
 #include <algorithm>

layout/base/nsDisplayList.h

@@ -19,11 +19,12 @@
 #include "nsPoint.h"
 #include "nsRect.h"
 #include "plarena.h"
+#include "Layers.h"
 #include "nsRegion.h"
-#include "FrameLayerBuilder.h"
 #include "nsLayoutUtils.h"
 #include "nsDisplayListInvalidation.h"
 #include "DisplayListClipState.h"
+#include "LayerState.h"
 
 #include <stdint.h>
 
@@ -38,6 +39,7 @@ class nsDisplayLayerEventRegions;
 class nsCaret;
 
 namespace mozilla {
+class FrameLayerBuilder;
 namespace layers {
 class Layer;
 class ImageLayer;

layout/generic/nsFrame.cpp

@@ -8,6 +8,9 @@
 
 #include "nsFrame.h"
 
+#include <stdarg.h>
+#include <algorithm>
+
 #include "mozilla/Attributes.h"
 #include "mozilla/DebugOnly.h"
 
@@ -30,7 +33,6 @@
 #include "nsIPresShell.h"
 #include "prlog.h"
 #include "prprf.h"
-#include <stdarg.h>
 #include "nsFrameManager.h"
 #include "nsLayoutUtils.h"
 #include "RestyleManager.h"
@@ -48,7 +50,7 @@
 #include "nsNameSpaceManager.h"
 #include "nsIPercentHeightObserver.h"
 #include "nsStyleStructInlines.h"
-#include <algorithm>
+#include "FrameLayerBuilder.h"
 
 #include "nsBidiPresUtils.h"
 

layout/ipc/RenderFrameParent.cpp

@@ -27,6 +27,7 @@
 #include "mozilla/layers/LayerManagerComposite.h"
 #include "mozilla/layers/CompositorChild.h"
 #include "ClientLayerManager.h"
+#include "FrameLayerBuilder.h"
 
 typedef nsContentView::ViewConfig ViewConfig;
 using namespace mozilla::dom;