Move TopDocumentRootScrollerController to a separate object on FrameHost

third_party/WebKit/Source/core/page/scrolling/TopDocumentRootScrollerController.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/page/scrolling/TopDocumentRootScrollerController.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/Element.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/page/ChromeClient.h"
+#include "core/page/Page.h"
 #include "core/page/scrolling/OverscrollController.h"
+#include "core/page/scrolling/RootScrollerUtil.h"
 #include "core/page/scrolling/ViewportScrollCallback.h"
 #include "platform/scroll/ScrollableArea.h"
 
 namespace blink {
 
 // static
 TopDocumentRootScrollerController* TopDocumentRootScrollerController::create(
-    Document& document)
+    FrameHost& host)
 {
-    return new TopDocumentRootScrollerController(document);
+    return new TopDocumentRootScrollerController(host);
 }
 
 TopDocumentRootScrollerController::TopDocumentRootScrollerController(
-    Document& document)
-    : RootScrollerController(document)
+    FrameHost& host)
+: m_frameHost(&host)
 {
 }
 
 DEFINE_TRACE(TopDocumentRootScrollerController)
 {
     visitor->trace(m_viewportApplyScroll);
     visitor->trace(m_globalRootScroller);
-    RootScrollerController::trace(visitor);
+    visitor->trace(m_frameHost);
 }
 
-void TopDocumentRootScrollerController::globalRootScrollerMayHaveChanged()
+void TopDocumentRootScrollerController::didChangeRootScroller()
 {
-    updateGlobalRootScroller();
+    recomputeGlobalRootScroller();
 }
 
 Element* TopDocumentRootScrollerController::findGlobalRootScrollerElement()
 {
-    Element* element = effectiveRootScroller();
+    if (!topDocument())
+        return nullptr;
+
+    DCHECK(topDocument()->rootScrollerController());
+    Element* element =
+        topDocument()->rootScrollerController()->effectiveRootScroller();
 
     while (element && element->isFrameOwnerElement()) {
         HTMLFrameOwnerElement* frameOwner = toHTMLFrameOwnerElement(element);
         DCHECK(frameOwner);
 
         Document* iframeDocument = frameOwner->contentDocument();
         if (!iframeDocument)
             return element;
 
         DCHECK(iframeDocument->rootScrollerController());
         element =
             iframeDocument->rootScrollerController()->effectiveRootScroller();
     }
 
     return element;
 }
 
-void TopDocumentRootScrollerController::updateGlobalRootScroller()
+void TopDocumentRootScrollerController::recomputeGlobalRootScroller()
 {
+    if (!m_viewportApplyScroll)
+        return;
+
     Element* target = findGlobalRootScrollerElement();
-
-    if (!m_viewportApplyScroll || !target)
+    if (!target)
         return;
 
     ScrollableArea* targetScroller =
-        scrollableAreaFor(*target);
+        RootScrollerUtil::scrollableAreaFor(*target);
 
     if (!targetScroller)
         return;
 
     if (m_globalRootScroller)
         m_globalRootScroller->removeApplyScroll();
 
     // Use disable-native-scroll since the ViewportScrollCallback needs to
     // apply scroll actions both before (TopControls) and after (overscroll)
     // scrolling the element so it will apply scroll to the element itself.
     target->setApplyScroll(m_viewportApplyScroll, "disable-native-scroll");
 
     m_globalRootScroller = target;
 
     // Ideally, scroll customization would pass the current element to scroll to
     // the apply scroll callback but this doesn't happen today so we set it
     // through a back door here. This is also needed by the
     // ViewportScrollCallback to swap the target into the layout viewport
     // in RootFrameViewport.
     m_viewportApplyScroll->setScroller(targetScroller);
 }
 
+Document* TopDocumentRootScrollerController::topDocument() const
+{
+    if (!m_frameHost)
+        return nullptr;
+
+    if (!m_frameHost->page().mainFrame()
+        || !m_frameHost->page().mainFrame()->isLocalFrame())
+        return nullptr;
+
+    return toLocalFrame(m_frameHost->page().mainFrame())->document();
+}
+
 void TopDocumentRootScrollerController::didUpdateCompositing()
 {
-    RootScrollerController::didUpdateCompositing();
+    if (!m_frameHost)
+        return;
 
     // Let the compositor-side counterpart know about this change.
-    if (FrameHost* frameHost = m_document->frameHost())
-        frameHost->chromeClient().registerViewportLayers();
+    m_frameHost->chromeClient().registerViewportLayers();
 }
 
-void TopDocumentRootScrollerController::didAttachDocument()
+void TopDocumentRootScrollerController::initializeViewportScrollCallback(
+    RootFrameViewport& rfv)

[tdresser, 2016/08/30 15:05:30]

Might as well write out the whole:
rootFrameViewport

[bokan, 2016/08/30 16:13:39]

Done.

 {
-    FrameHost* frameHost = m_document->frameHost();
-    FrameView* frameView = m_document->view();
+    DCHECK(m_frameHost);
+    m_viewportApplyScroll = ViewportScrollCallback::create(
+        &m_frameHost->topControls(),
+        &m_frameHost->overscrollController(),
+        rfv);
 
-    if (!frameHost || !frameView)
-        return;
-
-    RootFrameViewport* rootFrameViewport = frameView->getRootFrameViewport();
-    DCHECK(rootFrameViewport);
-
-    m_viewportApplyScroll = ViewportScrollCallback::create(
-        &frameHost->topControls(),
-        &frameHost->overscrollController(),
-        *rootFrameViewport);
-
-    updateGlobalRootScroller();
+    recomputeGlobalRootScroller();
 }
 
 bool TopDocumentRootScrollerController::isViewportScrollCallback(
     const ScrollStateCallback* callback) const
 {
     if (!callback)
         return false;
 
     return callback == m_viewportApplyScroll.get();
 }
 
 GraphicsLayer* TopDocumentRootScrollerController::rootScrollerLayer()
 {
     if (!m_globalRootScroller)
         return nullptr;
 
-    ScrollableArea* area = scrollableAreaFor(*m_globalRootScroller);
+    ScrollableArea* area =
+        RootScrollerUtil::scrollableAreaFor(*m_globalRootScroller);
 
     if (!area)
         return nullptr;
 
     GraphicsLayer* graphicsLayer = area->layerForScrolling();
 
     // TODO(bokan): We should assert graphicsLayer here and
     // RootScrollerController should do whatever needs to happen to ensure
     // the root scroller gets composited.
 
     return graphicsLayer;
 }
 
 } // namespace blink