Remove FrameHost::overscrollController() methods

third_party/WebKit/Source/core/input/ScrollManager.cpp

Index: third_party/WebKit/Source/core/input/ScrollManager.cpp
diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp
index 5ddbc2dbe6eacbe99c0804fb82e763d2da5b9ca9..2029f27ae8ee2e80b31834445bd757c374de1c56 100644
--- a/third_party/WebKit/Source/core/input/ScrollManager.cpp
+++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp
@@ -8,7 +8,6 @@
 #include "core/dom/DOMNodeIds.h"
 #include "core/events/GestureEvent.h"
 #include "core/frame/BrowserControls.h"
-#include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/input/EventHandler.h"
@@ -54,10 +53,10 @@ void ScrollManager::clearGestureScrollState() {
   m_deltaConsumedForScrollSequence = false;
   m_currentScrollChain.clear();
 
-  if (FrameHost* host = frameHost()) {
+  if (Page* page = m_frame->page()) {
     bool resetX = true;
     bool resetY = true;
-    host->overscrollController().resetAccumulated(resetX, resetY);
+    page->overscrollController().resetAccumulated(resetX, resetY);
   }
 }
 
@@ -309,9 +308,8 @@ WebInputEventResult ScrollManager::handleGestureScrollUpdate(
 
   if ((!m_previousGestureScrolledElement ||
        !isViewportScrollingElement(*m_previousGestureScrolledElement)) &&
-      frameHost())
-    frameHost()->overscrollController().resetAccumulated(didScrollX,
-                                                         didScrollY);
+      page())
+    page()->overscrollController().resetAccumulated(didScrollX, didScrollY);
 
   if (didScrollX || didScrollY) {
     setFrameWasScrolledByUser();
@@ -345,11 +343,8 @@ WebInputEventResult ScrollManager::handleGestureScrollEnd(
   return WebInputEventResult::NotHandled;
 }
 
-FrameHost* ScrollManager::frameHost() const {
-  if (!m_frame->page())
-    return nullptr;
-
-  return &m_frame->page()->frameHost();
+Page* ScrollManager::page() const {

[haraken, 2017/03/07 03:29:52]

This method doesn't look so useful. Maybe shall we inline it?

[sashab, 2017/03/07 03:33:44]

Good call; done.

+  return m_frame->page();
 }
 
 WebInputEventResult ScrollManager::passScrollGestureEventToWidget(