Implementing document.setRootScroller API for main thread scrolling.

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

Index: third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp b/third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp
index 3cef299eae114ab4788d3b722cfb54dc071cf4ad..77a4887ace3b6aa4999817731c446002faaa3e26 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ViewportScrollCallback.cpp
@@ -4,13 +4,10 @@
 
 #include "core/page/scrolling/ViewportScrollCallback.h"
 
-#include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
 #include "core/frame/TopControls.h"
-#include "core/frame/VisualViewport.h"
-#include "core/input/EventHandler.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/page/scrolling/OverscrollController.h"
 #include "core/page/scrolling/ScrollState.h"
@@ -19,11 +16,11 @@
 
 namespace blink {
 
-ViewportScrollCallback::ViewportScrollCallback(Document& document)
-    : m_document(&document)
+ViewportScrollCallback::ViewportScrollCallback(
+    TopControls& topControls, OverscrollController& overscrollController)
+    : m_topControls(&topControls)
+    , m_overscrollController(&overscrollController)
 {
-    // Only the root document can have a viewport scroll callback for now.
-    ASSERT(!document.ownerElement());
 }
 
 ViewportScrollCallback::~ViewportScrollCallback()
@@ -32,7 +29,9 @@ ViewportScrollCallback::~ViewportScrollCallback()
 
 DEFINE_TRACE(ViewportScrollCallback)
 {
-    visitor->trace(m_document);
+    visitor->trace(m_topControls);
+    visitor->trace(m_overscrollController);
+    visitor->trace(m_scroller);
     ScrollStateCallback::trace(visitor);
 }
 
@@ -42,12 +41,11 @@ bool ViewportScrollCallback::shouldScrollTopControls(const FloatSize& delta,
     if (granularity != ScrollByPixel && granularity != ScrollByPrecisePixel)
         return false;
 
-    ScrollableArea* rootFrameViewport = getRootFrameViewport();
-    if (!rootFrameViewport)
+    if (!m_scroller)
         return false;
 
-    DoublePoint maxScroll = rootFrameViewport->maximumScrollPositionDouble();
-    DoublePoint scrollPosition = rootFrameViewport->scrollPositionDouble();
+    DoublePoint maxScroll = m_scroller->maximumScrollPositionDouble();
+    DoublePoint scrollPosition = m_scroller->scrollPositionDouble();
 
     // Always give the delta to the top controls if the scroll is in
     // the direction to show the top controls. If it's in the
@@ -58,62 +56,48 @@ bool ViewportScrollCallback::shouldScrollTopControls(const FloatSize& delta,
 
 void ViewportScrollCallback::handleEvent(ScrollState* state)
 {
-    if (!m_document || !m_document->frameHost())
-        return;
-
-    TopControls& topControls = m_document->frameHost()->topControls();
-    OverscrollController& overscrollController =
-        m_document->frameHost()->overscrollController();
-
-    // Scroll top controls.
-    if (state->isBeginning())
-        topControls.scrollBegin();
-
     FloatSize delta(state->deltaX(), state->deltaY());
     ScrollGranularity granularity =
         ScrollGranularity(static_cast<int>(state->deltaGranularity()));
     FloatSize remainingDelta = delta;
 
-    if (shouldScrollTopControls(delta, granularity))
-        remainingDelta = topControls.scrollBy(delta);
+    // Scroll top controls.
+    if (m_topControls) {
+        if (state->isBeginning())
+            m_topControls->scrollBegin();
+
+        if (shouldScrollTopControls(delta, granularity))
+            remainingDelta = m_topControls->scrollBy(delta);
+    }
 
     bool topControlsConsumedScroll = remainingDelta.height() != delta.height();
 
-    // Do the native scroll.
-    ScrollableArea* rootFrameViewport = getRootFrameViewport();
-    if (!rootFrameViewport)
+    // Scroll the element's scrollable area.
+    if (!m_scroller)
         return;
 
-    ScrollResult result =
-        rootFrameViewport->userScroll(granularity, remainingDelta);
+    ScrollResult result = m_scroller->userScroll(granularity, remainingDelta);
 
     // We consider top controls movement to be scrolling.
     result.didScrollY |= topControlsConsumedScroll;
 
     // Handle Overscroll.
-    FloatPoint position(state->positionX(), state->positionY());
-    FloatSize velocity(state->velocityX(), state->velocityY());
-    overscrollController.handleOverscroll(result, position, velocity);
+    if (m_overscrollController) {
+        FloatPoint position(state->positionX(), state->positionY());
+        FloatSize velocity(state->velocityX(), state->velocityY());
+        m_overscrollController->handleOverscroll(result, position, velocity);
+    }
 
     // The viewport consumes everything.
+    // TODO: This isn't consuming everything

[tdresser, 2016/04/27 15:37:08]

Should this TODO have a bug associated with it?

[bokan, 2016/04/27 17:53:55]

Done.

     state->consumeDeltaNative(
         state->deltaX() - result.unusedScrollDeltaX,
         state->deltaY() - result.unusedScrollDeltaY);
 }
 
-ScrollableArea* ViewportScrollCallback::getRootFrameViewport() const
+void ViewportScrollCallback::setScroller(ScrollableArea& scroller)
 {
-    if (m_document->layoutViewItem().isNull())
-        return nullptr;
-
-    FrameView* frameView = m_document->layoutViewItem().frameView();
-    if (!frameView)
-        return nullptr;
-
-    ScrollableArea* rootFrameViewport = frameView->getScrollableArea();
-    ASSERT(rootFrameViewport);
-
-    return rootFrameViewport;
+    m_scroller = &scroller;
 }
 
 } // namespace blink