Move rendering/RenderLayer* to layout/

Source/core/layout/compositing/GraphicsLayerUpdater.cpp

 /*
  * Copyright (C) 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/layout/compositing/GraphicsLayerUpdater.h"
 
 #include "core/html/HTMLMediaElement.h"
 #include "core/inspector/InspectorTraceEvents.h"
+#include "core/layout/Layer.h"
+#include "core/layout/LayerReflectionInfo.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
-#include "core/layout/compositing/RenderLayerCompositor.h"
-#include "core/rendering/RenderLayer.h"
-#include "core/rendering/RenderLayerReflectionInfo.h"
+#include "core/layout/compositing/LayerCompositor.h"
 #include "platform/TraceEvent.h"
 
 namespace blink {
 
 class GraphicsLayerUpdater::UpdateContext {
 public:
     UpdateContext()
         : m_compositingStackingContext(0)
         , m_compositingAncestor(0)
     {
     }
 
-    UpdateContext(const UpdateContext& other, const RenderLayer& layer)
+    UpdateContext(const UpdateContext& other, const Layer& layer)
         : m_compositingStackingContext(other.m_compositingStackingContext)
         , m_compositingAncestor(other.compositingContainer(layer))
     {
         CompositingState compositingState = layer.compositingState();
         if (compositingState != NotComposited && compositingState != PaintsIntoGroupedBacking) {
             m_compositingAncestor = &layer;
             if (layer.stackingNode()->isStackingContext())
                 m_compositingStackingContext = &layer;
         }
     }
 
-    const RenderLayer* compositingContainer(const RenderLayer& layer) const
+    const Layer* compositingContainer(const Layer& layer) const
     {
         return layer.stackingNode()->isNormalFlowOnly() ? m_compositingAncestor : m_compositingStackingContext;
     }
 
-    const RenderLayer* compositingStackingContext() const
+    const Layer* compositingStackingContext() const
     {
         return m_compositingStackingContext;
     }
 
 private:
-    const RenderLayer* m_compositingStackingContext;
-    const RenderLayer* m_compositingAncestor;
+    const Layer* m_compositingStackingContext;
+    const Layer* m_compositingAncestor;
 };
 
 GraphicsLayerUpdater::GraphicsLayerUpdater()
     : m_needsRebuildTree(false)
 {
 }
 
 GraphicsLayerUpdater::~GraphicsLayerUpdater()
 {
 }
 
-void GraphicsLayerUpdater::update(RenderLayer& layer, Vector<RenderLayer*>& layersNeedingPaintInvalidation)
+void GraphicsLayerUpdater::update(Layer& layer, Vector<Layer*>& layersNeedingPaintInvalidation)
 {
     TRACE_EVENT0("blink", "GraphicsLayerUpdater::update");
     updateRecursive(layer, DoNotForceUpdate, UpdateContext(), layersNeedingPaintInvalidation);
     layer.compositor()->updateRootLayerPosition();
 }
 
-void GraphicsLayerUpdater::updateRecursive(RenderLayer& layer, UpdateType updateType, const UpdateContext& context, Vector<RenderLayer*>& layersNeedingPaintInvalidation)
+void GraphicsLayerUpdater::updateRecursive(Layer& layer, UpdateType updateType, const UpdateContext& context, Vector<Layer*>& layersNeedingPaintInvalidation)
 {
     if (layer.hasCompositedLayerMapping()) {
         CompositedLayerMapping* mapping = layer.compositedLayerMapping();
 
         if (updateType == ForceUpdate || mapping->needsGraphicsLayerUpdate()) {
-            const RenderLayer* compositingContainer = context.compositingContainer(layer);
+            const Layer* compositingContainer = context.compositingContainer(layer);
             ASSERT(compositingContainer == layer.enclosingLayerWithCompositedLayerMapping(ExcludeSelf));
 
             if (mapping->updateGraphicsLayerConfiguration())
                 m_needsRebuildTree = true;
 
             mapping->updateGraphicsLayerGeometry(compositingContainer, context.compositingStackingContext(), layersNeedingPaintInvalidation);
 
             if (mapping->hasUnpositionedOverflowControlsLayers())
                 layer.scrollableArea()->positionOverflowControls(IntSize());
 
             updateType = mapping->updateTypeForChildren(updateType);
             mapping->clearNeedsGraphicsLayerUpdate();
         }
     }
 
     UpdateContext childContext(context, layer);
-    for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibling())
+    for (Layer* child = layer.firstChild(); child; child = child->nextSibling())
         updateRecursive(*child, updateType, childContext, layersNeedingPaintInvalidation);
 }
 
 #if ENABLE(ASSERT)
 
-void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(RenderLayer& layer)
+void GraphicsLayerUpdater::assertNeedsToUpdateGraphicsLayerBitsCleared(Layer& layer)
 {
     if (layer.hasCompositedLayerMapping())
         layer.compositedLayerMapping()->assertNeedsToUpdateGraphicsLayerBitsCleared();
 
-    for (RenderLayer* child = layer.firstChild(); child; child = child->nextSibling())
+    for (Layer* child = layer.firstChild(); child; child = child->nextSibling())
         assertNeedsToUpdateGraphicsLayerBitsCleared(*child);
 }
 
 #endif
 
 } // namespace blink