Remove RenderLayerScrollableArea

sky/engine/core/rendering/RenderLayer.h

Index: sky/engine/core/rendering/RenderLayer.h
diff --git a/sky/engine/core/rendering/RenderLayer.h b/sky/engine/core/rendering/RenderLayer.h
index 6d4605f297181916de9c43fcada8d35e019ead79..c549b2926559f897c6e64c670960658dee8709b3 100644
--- a/sky/engine/core/rendering/RenderLayer.h
+++ b/sky/engine/core/rendering/RenderLayer.h
@@ -49,7 +49,6 @@
 #include "sky/engine/core/rendering/RenderBox.h"
 #include "sky/engine/core/rendering/RenderLayerClipper.h"
 #include "sky/engine/core/rendering/RenderLayerFilterInfo.h"
-#include "sky/engine/core/rendering/RenderLayerScrollableArea.h"
 #include "sky/engine/core/rendering/RenderLayerStackingNode.h"
 #include "sky/engine/core/rendering/RenderLayerStackingNodeIterator.h"
 #include "sky/engine/public/platform/WebBlendMode.h"
@@ -215,8 +214,6 @@ public:
     // Only safe to call from RenderLayerModelObject::destroyLayer()
     void operator delete(void*);
 
-    bool needsCompositedScrolling() const { return m_scrollableArea && m_scrollableArea->needsCompositedScrolling(); }
-
     bool paintsWithTransform() const;
 
     bool containsDirtyOverlayScrollbars() const { return m_containsDirtyOverlayScrollbars; }
@@ -248,8 +245,6 @@ public:
 
     bool scrollsWithRespectTo(const RenderLayer*) const;
 
-    // FIXME: This should probably return a ScrollableArea but a lot of internal methods are mistakenly exposed.
-    RenderLayerScrollableArea* scrollableArea() const { return m_scrollableArea.get(); }
     RenderLayerClipper& clipper() { return m_clipper; }
     const RenderLayerClipper& clipper() const { return m_clipper; }
 
@@ -260,8 +255,6 @@ public:
         return isRootLayer() || layerRenderer->isPositioned() || hasTransform();
     }
 
-    bool scrollsOverflow() const;
-
     class AncestorDependentCompositingInputs {
     public:
         AncestorDependentCompositingInputs()
@@ -363,8 +356,6 @@ public:
     RenderLayer* enclosingTransformedAncestor() const;
     LayoutPoint computeOffsetFromTransformedAncestor() const;
 
-    void didUpdateNeedsCompositedScrolling();
-
 private:
     // TODO(ojan): Get rid of this. These are basically layer-tree-only paint phases.
     enum PaintLayerFlags {
@@ -375,8 +366,6 @@ private:
     // Bounding box in the coordinates of this layer.
     LayoutRect logicalBoundingBox() const;
 
-    bool hasOverflowControls() const;
-
     void setAncestorChainHasSelfPaintingLayerDescendant();
     void dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
 
@@ -417,8 +406,6 @@ private:
         LayoutPoint& layerLocation, ClipRect& layerForegroundRect);
     void paintOutline(GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,
         LayoutPoint& layerLocation, ClipRect& layerOutlineRect);
-    void paintOverflowControls(GraphicsContext*, const LayerPaintingInfo&,
-        LayoutPoint& layerLocation, ClipRect& layerBackgroundRect);
     void paintMask(GraphicsContext*, const LayerPaintingInfo&, RenderObject* paintingRootForRenderer,
         LayoutPoint& layerLocation, ClipRect& layerBackgroundRect);
 
@@ -446,11 +433,6 @@ private:
     bool requiresStackingNode() const { return true; }
     void updateStackingNode();
 
-    // FIXME: We could lazily allocate our ScrollableArea based on style properties ('overflow', ...)
-    // but for now, we are always allocating it for RenderBox as it's safer.
-    bool requiresScrollableArea() const { return renderBox(); }
-    void updateScrollableArea();
-
     void updateTransform(const RenderStyle* oldStyle, RenderStyle* newStyle);
 
     void dirty3DTransformedDescendantStatus();
@@ -515,8 +497,6 @@ private:
     DescendantDependentCompositingInputs m_descendantDependentCompositingInputs;
     AncestorDependentCompositingInputs m_ancestorDependentCompositingInputs;
 
-    OwnPtr<RenderLayerScrollableArea> m_scrollableArea;
-
     RenderLayerClipper m_clipper; // FIXME: Lazily allocate?
     OwnPtr<RenderLayerStackingNode> m_stackingNode;