Move rendering/RenderLayer* to layout/

Source/core/layout/compositing/LayerCompositor.h

 /*
  * Copyright (C) 2009 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * 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.
  */
 
-#ifndef RenderLayerCompositor_h
-#define RenderLayerCompositor_h
+#ifndef LayerCompositor_h
+#define LayerCompositor_h
 
+#include "core/layout/Layer.h"
 #include "core/layout/compositing/CompositingReasonFinder.h"
-#include "core/rendering/RenderLayer.h"
 #include "platform/graphics/GraphicsLayerClient.h"
 #include "wtf/HashMap.h"
 
 namespace blink {
 
 class DocumentLifecycle;
 class GraphicsLayer;
 class GraphicsLayerFactory;
 class Page;
 class RenderPart;
 class ScrollingCoordinator;
 
 enum CompositingUpdateType {
     CompositingUpdateNone,
     CompositingUpdateAfterGeometryChange,
     CompositingUpdateAfterCompositingInputChange,
     CompositingUpdateRebuildTree,
 };
 
 enum CompositingStateTransitionType {
     NoCompositingStateChange,
     AllocateOwnCompositedLayerMapping,
     RemoveOwnCompositedLayerMapping,
     PutInSquashingLayer,
     RemoveFromSquashingLayer
 };
 
-// RenderLayerCompositor manages the hierarchy of
-// composited RenderLayers. It determines which RenderLayers
+// LayerCompositor manages the hierarchy of
+// composited Layers. It determines which Layers
 // become compositing, and creates and maintains a hierarchy of
-// GraphicsLayers based on the RenderLayer painting order.
+// GraphicsLayers based on the Layer painting order.
 //
-// There is one RenderLayerCompositor per RenderView.
+// There is one LayerCompositor per RenderView.
 
-class RenderLayerCompositor final : public GraphicsLayerClient {
+class LayerCompositor final : public GraphicsLayerClient {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    explicit RenderLayerCompositor(RenderView&);
-    virtual ~RenderLayerCompositor();
+    explicit LayerCompositor(RenderView&);
+    virtual ~LayerCompositor();
 
     void updateIfNeededRecursive();
 
     // Return true if this RenderView is in "compositing mode" (i.e. has one or more
-    // composited RenderLayers)
+    // composited Layers)
     bool inCompositingMode() const;
     // FIXME: Replace all callers with inCompositingMode and remove this function.
     bool staleInCompositingMode() const;
     // This will make a compositing layer at the root automatically, and hook up to
     // the native view/window system.
     void setCompositingModeEnabled(bool);
 
     // Returns true if the accelerated compositing is enabled
     bool hasAcceleratedCompositing() const { return m_hasAcceleratedCompositing; }
 
     bool preferCompositingToLCDTextEnabled() const;
 
     bool rootShouldAlwaysComposite() const;
 
     // Copy the accelerated compositing related flags from Settings
     void updateAcceleratedCompositingSettings();
 
     // Used to indicate that a compositing update will be needed for the next frame that gets drawn.
     void setNeedsCompositingUpdate(CompositingUpdateType);
 
     void didLayout();
 
-    // Whether layer's compositedLayerMapping needs a GraphicsLayer to clip z-order children of the given RenderLayer.
-    bool clipsCompositingDescendants(const RenderLayer*) const;
+    // Whether layer's compositedLayerMapping needs a GraphicsLayer to clip z-order children of the given Layer.
+    bool clipsCompositingDescendants(const Layer*) const;
 
     // Whether the given layer needs an extra 'contents' layer.
-    bool needsContentsCompositingLayer(const RenderLayer*) const;
+    bool needsContentsCompositingLayer(const Layer*) const;
 
     bool supportsFixedRootBackgroundCompositing() const;
-    bool needsFixedRootBackgroundLayer(const RenderLayer*) const;
+    bool needsFixedRootBackgroundLayer(const Layer*) const;
     GraphicsLayer* fixedRootBackgroundLayer() const;
     void setNeedsUpdateFixedBackground() { m_needsUpdateFixedBackground = true; }
 
-    // Issue paint invalidations of the appropriate layers when the given RenderLayer starts or stops being composited.
-    void paintInvalidationOnCompositingChange(RenderLayer*);
+    // Issue paint invalidations of the appropriate layers when the given Layer starts or stops being composited.
+    void paintInvalidationOnCompositingChange(Layer*);
 
     void fullyInvalidatePaint();
 
-    RenderLayer* rootRenderLayer() const;
+    Layer* rootLayer() const;
     GraphicsLayer* rootGraphicsLayer() const;
     GraphicsLayer* frameScrollLayer() const;
     GraphicsLayer* scrollLayer() const;
     GraphicsLayer* containerLayer() const;
 
     // We don't always have a root transform layer. This function lazily allocates one
     // and returns it as required.
     GraphicsLayer* ensureRootTransformLayer();
 
     enum RootLayerAttachment {
         RootLayerUnattached,
         RootLayerAttachedViaChromeClient,
         RootLayerAttachedViaEnclosingFrame
     };
 
     RootLayerAttachment rootLayerAttachment() const { return m_rootLayerAttachment; }
     void updateRootLayerAttachment();
     void updateRootLayerPosition();
 
     void setIsInWindow(bool);
 
-    static RenderLayerCompositor* frameContentsCompositor(RenderPart*);
+    static LayerCompositor* frameContentsCompositor(RenderPart*);
     // Return true if the layers changed.
     static bool parentFrameContentLayers(RenderPart*);
 
     // Update the geometry of the layers used for clipping and scrolling in frames.
     void frameViewDidChangeLocation(const IntPoint& contentsOffset);
     void frameViewDidChangeSize();
     void frameViewDidScroll();
     void frameViewScrollbarsExistenceDidChange();
     void rootFixedBackgroundsChanged();
 
-    bool scrollingLayerDidChange(RenderLayer*);
+    bool scrollingLayerDidChange(Layer*);
 
     String layerTreeAsText(LayerTreeFlags);
 
     GraphicsLayer* layerForHorizontalScrollbar() const { return m_layerForHorizontalScrollbar.get(); }
     GraphicsLayer* layerForVerticalScrollbar() const { return m_layerForVerticalScrollbar.get(); }
     GraphicsLayer* layerForScrollCorner() const { return m_layerForScrollCorner.get(); }
 
     void resetTrackedPaintInvalidationRects();
     void setTracksPaintInvalidations(bool);
 
     virtual String debugName(const GraphicsLayer*) override;
     DocumentLifecycle& lifecycle() const;
 
-    void updatePotentialCompositingReasonsFromStyle(RenderLayer*);
+    void updatePotentialCompositingReasonsFromStyle(Layer*);
 
     // Whether the layer could ever be composited.
-    bool canBeComposited(const RenderLayer*) const;
+    bool canBeComposited(const Layer*) const;
 
     // FIXME: Move allocateOrClearCompositedLayerMapping to CompositingLayerAssigner once we've fixed
     // the compositing chicken/egg issues.
-    bool allocateOrClearCompositedLayerMapping(RenderLayer*, CompositingStateTransitionType compositedLayerUpdate);
+    bool allocateOrClearCompositedLayerMapping(Layer*, CompositingStateTransitionType compositedLayerUpdate);
 
-    void updateDirectCompositingReasons(RenderLayer*);
+    void updateDirectCompositingReasons(Layer*);
 
     void setOverlayLayer(GraphicsLayer*);
 
     bool inOverlayFullscreenVideo() const { return m_inOverlayFullscreenVideo; }
 
 private:
 #if ENABLE(ASSERT)
     void assertNoUnresolvedDirtyBits();
 #endif
 
@@ skipping 60 matching lines @@
     // Layers for overflow controls
     OwnPtr<GraphicsLayer> m_layerForHorizontalScrollbar;
     OwnPtr<GraphicsLayer> m_layerForVerticalScrollbar;
     OwnPtr<GraphicsLayer> m_layerForScrollCorner;
 
     bool m_inOverlayFullscreenVideo;
 };
 
 } // namespace blink
 
-#endif // RenderLayerCompositor_h
+#endif // LayerCompositor_h