Remove FrameHost::overscrollController() methods

third_party/WebKit/Source/core/input/ScrollManager.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/input/ScrollManager.h"
 
 #include <memory>
 #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"
 #include "core/input/EventHandlingUtil.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/loader/DocumentLoader.h"
 #include "core/page/AutoscrollController.h"
 #include "core/page/Page.h"
@@ skipping 25 matching lines @@
   visitor->trace(m_scrollbarHandlingScrollGesture);
   visitor->trace(m_resizeScrollableArea);
 }
 
 void ScrollManager::clearGestureScrollState() {
   m_scrollGestureHandlingNode = nullptr;
   m_previousGestureScrolledElement = nullptr;
   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);
   }
 }
 
 void ScrollManager::stopAutoscroll() {
   if (AutoscrollController* controller = autoscrollController())
     controller->stopAutoscroll();
 }
 
 bool ScrollManager::middleClickAutoscrollInProgress() const {
   return autoscrollController() &&
@@ skipping 231 matching lines @@
   m_previousGestureScrolledElement =
       scrollState->currentNativeScrollingElement();
   m_deltaConsumedForScrollSequence =
       scrollState->deltaConsumedForScrollSequence();
 
   bool didScrollX = scrollState->deltaX() != delta.width();
   bool didScrollY = scrollState->deltaY() != delta.height();
 
   if ((!m_previousGestureScrolledElement ||
        !isViewportScrollingElement(*m_previousGestureScrolledElement)) &&
-      frameHost())
-    frameHost()->overscrollController().resetAccumulated(didScrollX,
-                                                         didScrollY);
+      page())
+    page()->overscrollController().resetAccumulated(didScrollX, didScrollY);
 
   if (didScrollX || didScrollY) {
     setFrameWasScrolledByUser();
     return WebInputEventResult::HandledSystem;
   }
 
   return WebInputEventResult::NotHandled;
 }
 
 WebInputEventResult ScrollManager::handleGestureScrollEnd(
@@ skipping 13 matching lines @@
     scrollStateData->delta_consumed_for_scroll_sequence =
         m_deltaConsumedForScrollSequence;
     ScrollState* scrollState = ScrollState::create(std::move(scrollStateData));
     customizedScroll(*node, *scrollState);
   }
 
   clearGestureScrollState();
   return WebInputEventResult::NotHandled;
 }
 
-FrameHost* ScrollManager::frameHost() const {
-  if (!m_frame->page())
-    return nullptr;
-
-  return &m_frame->page()->frameHost();
+Page* ScrollManager::page() const {
+  return m_frame->page();
 }
 
 WebInputEventResult ScrollManager::passScrollGestureEvent(
     const WebGestureEvent& gestureEvent,
     LayoutObject* layoutObject) {
   DCHECK(gestureEvent.isScrollEvent());
 
   if (!m_lastGestureScrollOverFrameViewBase || !layoutObject ||
       !layoutObject->isLayoutPart())
     return WebInputEventResult::NotHandled;
@@ skipping 195 matching lines @@
     if (scrollbar->gestureEvent(targetedEvent.event(), &shouldUpdateCapture)) {
       if (shouldUpdateCapture)
         m_scrollbarHandlingScrollGesture = scrollbar;
       return true;
     }
   }
   return false;
 }
 
 }  // namespace blink