Factor painting code from RenderLayerScrollableArea into ScrollableAreaPainter

Source/core/rendering/RenderLayerScrollableArea.h

 /*
  * Copyright (C) 2003, 2009, 2012 Apple Inc. All rights reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 26 matching lines @@
  * version of this file under the LGPL, indicate your decision by
  * deletingthe provisions above and replace them with the notice and
  * other provisions required by the MPL or the GPL, as the case may be.
  * If you do not delete the provisions above, a recipient may use your
  * version of this file under any of the LGPL, the MPL or the GPL.
  */
 
 #ifndef RenderLayerScrollableArea_h
 #define RenderLayerScrollableArea_h
 
+
+#include "core/rendering/LayerFragment.h"
+#include "core/rendering/RenderBox.h"
+
 #include "platform/scroll/ScrollableArea.h"
 
 namespace blink {
 
 enum ResizerHitTestType {
     ResizerForPointer,
     ResizerForTouch
 };
 
 class PlatformEvent;
@@ skipping 65 matching lines @@
     void scrollToYOffset(double y, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(DoubleSize(scrollXOffset(), y), clamp); }
 
     void updateAfterLayout();
     void updateAfterStyleChange(const RenderStyle*);
     void updateAfterOverflowRecalc();
 
     virtual bool updateAfterCompositingChange() override;
 
     bool hasScrollbar() const { return m_hBar || m_vBar; }
 
-    // FIXME: This should be removed.
-    bool hasScrollCorner() const { return m_scrollCorner; }
+    RenderScrollbarPart* scrollCorner() const { return m_scrollCorner; }
 
     void resize(const PlatformEvent&, const LayoutSize&);
     IntSize offsetFromResizeCorner(const IntPoint& absolutePoint) const;
 
     bool inResizeMode() const { return m_inResizeMode; }
     void setInResizeMode(bool inResizeMode) { m_inResizeMode = inResizeMode; }
 
     IntRect touchResizerCornerRect(const IntRect& bounds) const
     {
         return resizerCornerRect(bounds, ResizerForTouch);
     }
 
     LayoutUnit scrollWidth() const;
     LayoutUnit scrollHeight() const;
     int pixelSnappedScrollWidth() const;
     int pixelSnappedScrollHeight() const;
 
     int verticalScrollbarWidth(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
     int horizontalScrollbarHeight(OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize) const;
 
     DoubleSize adjustedScrollOffset() const { return DoubleSize(scrollXOffset(), scrollYOffset()); }
 
-    void paintResizer(GraphicsContext*, const IntPoint& paintOffset, const IntRect& damageRect);
-    void paintOverflowControls(GraphicsContext*, const IntPoint& paintOffset, const IntRect& damageRect, bool paintingOverlayControls);
-    void paintScrollCorner(GraphicsContext*, const IntPoint&, const IntRect& damageRect);
-
     void positionOverflowControls(const IntSize& offsetFromRoot);
 
     // isPointInResizeControl() is used for testing if a pointer/touch position is in the resize control
     // area.
     bool isPointInResizeControl(const IntPoint& absolutePoint, ResizerHitTestType) const;
     bool hitTestOverflowControls(HitTestResult&, const IntPoint& localPoint);
 
     bool hitTestResizerInFragments(const LayerFragments&, const HitTestLocation&) const;
 
     LayoutRect exposeRect(const LayoutRect&, const ScrollAlignment& alignX, const ScrollAlignment& alignY);
 
     // Returns true our scrollable area is in the FrameView's collection of scrollable areas. This can
     // only happen if we're both scrollable, and we do in fact overflow. This means that overflow: hidden
     // layers never get added to the FrameView's collection.
     bool scrollsOverflow() const { return m_scrollsOverflow; }
 
     // Rectangle encompassing the scroll corner and resizer rect.
     IntRect scrollCornerAndResizerRect() const;
 
     void updateNeedsCompositedScrolling();
     bool needsCompositedScrolling() const { return m_needsCompositedScrolling; }
 
     // These are used during compositing updates to determine if the overflow
     // controls need to be repositioned in the GraphicsLayer tree.
     void setTopmostScrollChild(RenderLayer*);
     RenderLayer* topmostScrollChild() const { ASSERT(!m_nextTopmostScrollChild); return m_topmostScrollChild; }
 
+    IntRect resizerCornerRect(const IntRect&, ResizerHitTestType) const;
+
+    RenderBox& box() const;
+    RenderLayer* layer() const;
+
+    RenderScrollbarPart* resizer() { return m_resizer; }
+
+    const IntPoint& cachedOverlayScrollbarOffset() { return m_cachedOverlayScrollbarOffset; }
+    void setCachedOverlayScrollbarOffset(const IntPoint& offset) { m_cachedOverlayScrollbarOffset = offset; }
+
+    IntRect rectForHorizontalScrollbar(const IntRect& borderBoxRect) const;
+    IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const;
+
 private:
     bool hasHorizontalOverflow() const;
     bool hasVerticalOverflow() const;
     bool hasScrollableHorizontalOverflow() const;
     bool hasScrollableVerticalOverflow() const;
 
     void computeScrollDimensions();
 
     DoubleSize clampScrollOffset(const DoubleSize&) const;
 
-    IntRect rectForHorizontalScrollbar(const IntRect& borderBoxRect) const;
-    IntRect rectForVerticalScrollbar(const IntRect& borderBoxRect) const;
+
     LayoutUnit verticalScrollbarStart(int minX, int maxX) const;
     LayoutUnit horizontalScrollbarStart(int minX) const;
     IntSize scrollbarOffset(const Scrollbar*) const;
 
     PassRefPtrWillBeRawPtr<Scrollbar> createScrollbar(ScrollbarOrientation);
     void destroyScrollbar(ScrollbarOrientation);
 
     void setHasHorizontalScrollbar(bool hasScrollbar);
     void setHasVerticalScrollbar(bool hasScrollbar);
 
     void updateScrollCornerStyle();
 
     // See comments on isPointInResizeControl.
-    IntRect resizerCornerRect(const IntRect&, ResizerHitTestType) const;
-    bool overflowControlsIntersectRect(const IntRect& localRect) const;
     void updateResizerAreaSet();
     void updateResizerStyle();
-    void drawPlatformResizerImage(GraphicsContext*, IntRect resizerCornerRect);
 
-    RenderBox& box() const;
-    RenderLayer* layer() const;
 
     void updateScrollableAreaSet(bool hasOverflow);
 
     void updateCompositingLayersAfterScroll();
 
     RenderLayer& m_layer;
 
     // Keeps track of whether the layer is currently resizing, so events can cause resizing to start and stop.
     unsigned m_inResizeMode : 1;
     unsigned m_scrollsOverflow : 1;
@@ skipping 23 matching lines @@
     // Renderers to hold our custom scroll corner.
     RawPtrWillBePersistent<RenderScrollbarPart> m_scrollCorner;
 
     // Renderers to hold our custom resizer.
     RawPtrWillBePersistent<RenderScrollbarPart> m_resizer;
 };
 
 } // namespace blink
 
 #endif // RenderLayerScrollableArea_h