Remove FrameView::containsScrollableArea

Source/core/rendering/RenderLayerScrollableArea.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 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 58 matching lines @@
 #include "platform/scroll/ScrollbarTheme.h"
 #include "public/platform/Platform.h"
 
 namespace WebCore {
 
 const int ResizerControlExpandRatioForTouch = 2;
 
 RenderLayerScrollableArea::RenderLayerScrollableArea(RenderBox* box)
     : m_box(box)
     , m_inResizeMode(false)
+    , m_scrollsOverflow(false)
     , m_scrollDimensionsDirty(true)
     , m_inOverflowRelayout(false)
     , m_needsCompositedScrolling(false)
     , m_forceNeedsCompositedScrolling(DoNotForceCompositedScrolling)
     , m_scrollCorner(0)
     , m_resizer(0)
 {
     ScrollableArea::setConstrainsScrollingToContentEdge(false);
 
     Node* node = m_box->node();
@@ skipping 871 matching lines @@
     if (m_resizer)
         m_resizer->setFrameRect(resizerCornerRect(borderBox, ResizerForPointer));
 
     // FIXME, this should eventually be removed, once we are certain that composited
     // controls get correctly positioned on a compositor update. For now, conservatively
     // leaving this unchanged.
     if (m_box->hasCompositedLayerMapping())
         m_box->compositedLayerMapping()->positionOverflowControlsLayers(offsetFromRoot);
 }
 
-bool RenderLayerScrollableArea::scrollsOverflow() const
-{
-    if (FrameView* frameView = m_box->view()->frameView())
-        return frameView->containsScrollableArea(this);
-
-    return false;
-}
-
 void RenderLayerScrollableArea::updateScrollCornerStyle()
 {
     if (!m_scrollCorner && !hasScrollbar())
         return;
     if (!m_scrollCorner && hasOverlayScrollbars())
         return;
 
     RenderObject* actualRenderer = rendererForScrollbar(m_box);
     RefPtr<RenderStyle> corner = m_box->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(PseudoStyleRequest(SCROLLBAR_CORNER), actualRenderer->style()) : PassRefPtr<RenderStyle>(nullptr);
     if (corner) {
@@ skipping 420 matching lines @@
         return;
 
     FrameView* frameView = frame->view();
     if (!frameView)
         return;
 
     bool isVisibleToHitTest = m_box->visibleToHitTesting();
     if (HTMLFrameOwnerElement* owner = frame->ownerElement())
         isVisibleToHitTest &= owner->renderer() && owner->renderer()->visibleToHitTesting();
 
-    bool requiresScrollableArea = hasOverflow && isVisibleToHitTest;
+    m_scrollsOverflow = hasOverflow && isVisibleToHitTest;
+
     bool updatedScrollableAreaSet = false;
-    if (requiresScrollableArea) {
+    if (m_scrollsOverflow) {
         if (frameView->addScrollableArea(this))
             updatedScrollableAreaSet = true;
     } else {
         if (frameView->removeScrollableArea(this))
             updatedScrollableAreaSet = true;
     }
 
     if (updatedScrollableAreaSet) {
         // We always want composited scrolling if compositor driven accelerated
         // scrolling is enabled. Since we will not update needs composited scrolling
         // in this case, we must force our state to update.
         RenderLayerCompositor* compositor = m_box->view()->compositor();
         if (compositor->acceleratedCompositingForOverflowScrollEnabled())
             layer()->didUpdateNeedsCompositedScrolling();
-        else if (requiresScrollableArea)
+        else if (m_scrollsOverflow)
             compositor->setNeedsUpdateCompositingRequirementsState();
         else
             setNeedsCompositedScrolling(false);
     }
 }
 
 void RenderLayerScrollableArea::updateNeedsCompositedScrolling()
 {
     TRACE_EVENT0("comp-scroll", "RenderLayer::updateNeedsCompositedScrolling");
     RenderLayerCompositor* compositor = m_box->view()->compositor();
@@ skipping 74 matching lines @@
 void RenderLayerScrollableArea::setForceNeedsCompositedScrolling(ForceNeedsCompositedScrollingMode mode)
 {
     if (m_forceNeedsCompositedScrolling == mode)
         return;
 
     m_forceNeedsCompositedScrolling = mode;
     layer()->didUpdateNeedsCompositedScrolling();
 }
 
 } // Namespace WebCore