Move rendering/RenderLayer* to layout/

Source/core/layout/compositing/GraphicsLayerTreeBuilder.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/GraphicsLayerTreeBuilder.h"
 
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLVideoElement.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 "core/rendering/RenderPart.h"
 #include "core/rendering/RenderView.h"
 
 namespace blink {
 
 GraphicsLayerTreeBuilder::GraphicsLayerTreeBuilder()
 {
 }
 
 GraphicsLayerTreeBuilder::~GraphicsLayerTreeBuilder()
 {
 }
 
-static bool shouldAppendLayer(const RenderLayer& layer)
+static bool shouldAppendLayer(const Layer& layer)
 {
     if (!RuntimeEnabledFeatures::overlayFullscreenVideoEnabled())
         return true;
     Node* node = layer.renderer()->node();
     if (node && isHTMLVideoElement(*node)) {
         HTMLVideoElement* element = toHTMLVideoElement(node);
         // For WebRTC, video frame contains all the data and no hardware surface is used.
         // We should always append the layer in this case.
         if (element->isFullscreen() && !HTMLMediaElement::isMediaStreamURL(element->sourceURL().string()))
             return false;
     }
     return true;
 }
 
-void GraphicsLayerTreeBuilder::rebuild(RenderLayer& layer, AncestorInfo info)
+void GraphicsLayerTreeBuilder::rebuild(Layer& layer, AncestorInfo info)
 {
     // Make the layer compositing if necessary, and set up clipping and content layers.
     // Note that we can only do work here that is independent of whether the descendant layers
     // have been processed. computeCompositingRequirements() will already have done the paint invalidation if necessary.
 
     layer.stackingNode()->updateLayerListsIfNeeded();
 
     const bool hasCompositedLayerMapping = layer.hasCompositedLayerMapping();
     CompositedLayerMapping* currentCompositedLayerMapping = layer.compositedLayerMapping();
 
     // If this layer has a compositedLayerMapping, then that is where we place subsequent children GraphicsLayers.
     // Otherwise children continue to append to the child list of the enclosing layer.
     GraphicsLayerVector layerChildren;
     AncestorInfo infoForChildren(info);
     if (hasCompositedLayerMapping) {
         infoForChildren.childLayersOfEnclosingCompositedLayer = &layerChildren;
         infoForChildren.enclosingCompositedLayer = &layer;
     }
 
 #if ENABLE(ASSERT)
     LayerListMutationDetector mutationChecker(layer.stackingNode());
 #endif
 
     if (layer.stackingNode()->isStackingContext()) {
-        RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NegativeZOrderChildren);
-        while (RenderLayerStackingNode* curNode = iterator.next())
+        LayerStackingNodeIterator iterator(*layer.stackingNode(), NegativeZOrderChildren);
+        while (LayerStackingNode* curNode = iterator.next())
             rebuild(*curNode->layer(), infoForChildren);
 
         // If a negative z-order child is compositing, we get a foreground layer which needs to get parented.
         if (hasCompositedLayerMapping && currentCompositedLayerMapping->foregroundLayer())
             infoForChildren.childLayersOfEnclosingCompositedLayer->append(currentCompositedLayerMapping->foregroundLayer());
     }
 
-    RenderLayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowChildren | PositiveZOrderChildren);
-    while (RenderLayerStackingNode* curNode = iterator.next())
+    LayerStackingNodeIterator iterator(*layer.stackingNode(), NormalFlowChildren | PositiveZOrderChildren);
+    while (LayerStackingNode* curNode = iterator.next())
         rebuild(*curNode->layer(), infoForChildren);
 
     if (hasCompositedLayerMapping) {
         bool parented = false;
         if (layer.renderer()->isRenderPart())
-            parented = RenderLayerCompositor::parentFrameContentLayers(toRenderPart(layer.renderer()));
+            parented = LayerCompositor::parentFrameContentLayers(toRenderPart(layer.renderer()));
 
         if (!parented)
             currentCompositedLayerMapping->parentForSublayers()->setChildren(layerChildren);
 
         // If the layer has a clipping layer the overflow controls layers will be siblings of the clipping layer.
         // Otherwise, the overflow control layers are normal children.
         // FIXME: Why isn't this handled in CLM updateInternalHierarchy?
         if (!currentCompositedLayerMapping->hasClippingLayer() && !currentCompositedLayerMapping->hasScrollingLayer()) {
             if (GraphicsLayer* overflowControlLayer = currentCompositedLayerMapping->layerForHorizontalScrollbar()) {
                 overflowControlLayer->removeFromParent();
@@ skipping 16 matching lines @@
     }
 
     if (layer.scrollParent()
         && layer.scrollParent()->hasCompositedLayerMapping()
         && layer.scrollParent()->compositedLayerMapping()->needsToReparentOverflowControls()
         && layer.scrollParent()->scrollableArea()->topmostScrollChild() == &layer)
         info.childLayersOfEnclosingCompositedLayer->append(layer.scrollParent()->compositedLayerMapping()->detachLayerForOverflowControls(*info.enclosingCompositedLayer));
 }
 
 }