Revert 168554 "Reduce compositing update in Silk's toggle_drawer..."

trunk/Source/core/rendering/compositing/CompositedLayerMapping.h

Index: trunk/Source/core/rendering/compositing/CompositedLayerMapping.h
===================================================================
--- trunk/Source/core/rendering/compositing/CompositedLayerMapping.h	(revision 168555)
+++ trunk/Source/core/rendering/compositing/CompositedLayerMapping.h	(working copy)
@@ -27,7 +27,6 @@
 #define CompositedLayerMapping_h
 
 #include "core/rendering/RenderLayer.h"
-#include "core/rendering/compositing/GraphicsLayerUpdater.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatPoint3D.h"
 #include "platform/graphics/GraphicsLayer.h"
@@ -95,7 +94,7 @@
     // Returns true if layer configuration changed.
     bool updateGraphicsLayerConfiguration();
     // Update graphics layer position and bounds.
-    GraphicsLayerUpdater::UpdateType updateGraphicsLayerGeometry(GraphicsLayerUpdater::UpdateType);
+    void updateGraphicsLayerGeometry(); // make private
     // Update whether layer needs blending.
     void updateContentsOpaque();
 
@@ -196,9 +195,6 @@
 
     void setBlendMode(blink::WebBlendMode);
 
-    void setNeedsGeometryUpdate();
-    void clearNeedsGeometryUpdate();
-
     virtual String debugName(const GraphicsLayer*) OVERRIDE;
 
     LayoutSize subpixelAccumulation() const { return m_subpixelAccumulation; }
@@ -357,14 +353,12 @@
     LayoutRect m_compositedBounds;
     LayoutSize m_subpixelAccumulation; // The accumulated subpixel offset of the compositedBounds compared to absolute coordinates.
 
-    bool m_artificiallyInflatedBounds : 1; // bounds had to be made non-zero to make transform-origin work
-    bool m_isMainFrameRenderViewLayer : 1;
-    bool m_requiresOwnBackingStoreForIntrinsicReasons : 1;
-    bool m_requiresOwnBackingStoreForAncestorReasons : 1;
-    bool m_canCompositeFilters : 1;
-    bool m_backgroundLayerPaintsFixedRootBackground : 1;
-    bool m_needToUpdateGeometry : 1;
-    bool m_needToUpdateGeometryOfAllDecendants : 1;
+    bool m_artificiallyInflatedBounds; // bounds had to be made non-zero to make transform-origin work
+    bool m_isMainFrameRenderViewLayer;
+    bool m_requiresOwnBackingStoreForIntrinsicReasons;
+    bool m_requiresOwnBackingStoreForAncestorReasons;
+    bool m_canCompositeFilters;
+    bool m_backgroundLayerPaintsFixedRootBackground;
 };
 
 } // namespace WebCore