Move overscroll logic out of EventHandler.

third_party/WebKit/Source/core/frame/FrameHost.cpp

Index: third_party/WebKit/Source/core/frame/FrameHost.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameHost.cpp b/third_party/WebKit/Source/core/frame/FrameHost.cpp
index 90c54b893a8ba43504bf11198526cde4df1a3fa6..9d05d9d0ea0a8c3ed5703852b957e717af1a7e4e 100644
--- a/third_party/WebKit/Source/core/frame/FrameHost.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameHost.cpp
@@ -37,6 +37,7 @@
 #include "core/frame/TopControls.h"
 #include "core/inspector/ConsoleMessageStorage.h"
 #include "core/page/Page.h"
+#include "core/page/scrolling/OverscrollController.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebScheduler.h"
 
@@ -52,6 +53,9 @@ FrameHost::FrameHost(Page& page)
     , m_topControls(TopControls::create(*this))
     , m_pageScaleConstraintsSet(PageScaleConstraintsSet::create())
     , m_visualViewport(VisualViewport::create(*this))
+    , m_overscrollController(OverscrollController::create(
+        *m_visualViewport,
+        m_page->chromeClient()))
     , m_eventHandlerRegistry(new EventHandlerRegistry(*this))
     , m_consoleMessageStorage(ConsoleMessageStorage::create())
     , m_subframeCount(0)
@@ -63,22 +67,52 @@ FrameHost::~FrameHost()
 {
 }
 
-Settings& FrameHost::settings() const
+Page& FrameHost::page()
+{
+    return *m_page;
+}
+
+const Page& FrameHost::page() const
+{
+    return *m_page;
+}
+
+Settings& FrameHost::settings()
 {
     return m_page->settings();
 }
 
-ChromeClient& FrameHost::chromeClient() const
+const Settings& FrameHost::settings() const
+{
+    return m_page->settings();
+}
+
+ChromeClient& FrameHost::chromeClient()
+{
+    return m_page->chromeClient();
+}
+
+const ChromeClient& FrameHost::chromeClient() const
 {
     return m_page->chromeClient();
 }
 
-UseCounter& FrameHost::useCounter() const
+UseCounter& FrameHost::useCounter()
+{
+    return m_page->useCounter();
+}
+
+const UseCounter& FrameHost::useCounter() const
 {
     return m_page->useCounter();
 }
 
-Deprecation& FrameHost::deprecation() const
+Deprecation& FrameHost::deprecation()
+{
+    return m_page->deprecation();
+}
+
+const Deprecation& FrameHost::deprecation() const
 {
     return m_page->deprecation();
 }
@@ -88,27 +122,62 @@ float FrameHost::deviceScaleFactor() const
     return m_page->deviceScaleFactor();
 }
 
-TopControls& FrameHost::topControls() const
+TopControls& FrameHost::topControls()
+{
+    return *m_topControls;
+}
+
+const TopControls& FrameHost::topControls() const
 {
     return *m_topControls;
 }
 
-VisualViewport& FrameHost::visualViewport() const
+OverscrollController& FrameHost::overscrollController()
+{
+    return *m_overscrollController;
+}
+
+const OverscrollController& FrameHost::overscrollController() const
+{
+    return *m_overscrollController;
+}
+
+VisualViewport& FrameHost::visualViewport()
+{
+    return *m_visualViewport;
+}
+
+const VisualViewport& FrameHost::visualViewport() const
 {
     return *m_visualViewport;
 }
 
-PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const
+PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet()
 {
     return *m_pageScaleConstraintsSet;
 }
 
-EventHandlerRegistry& FrameHost::eventHandlerRegistry() const
+const PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const
+{
+    return *m_pageScaleConstraintsSet;
+}
+
+EventHandlerRegistry& FrameHost::eventHandlerRegistry()
+{
+    return *m_eventHandlerRegistry;
+}
+
+const EventHandlerRegistry& FrameHost::eventHandlerRegistry() const
 {
     return *m_eventHandlerRegistry;
 }
 
-ConsoleMessageStorage& FrameHost::consoleMessageStorage() const
+ConsoleMessageStorage& FrameHost::consoleMessageStorage()
+{
+    return *m_consoleMessageStorage;
+}
+
+const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const
 {
     return *m_consoleMessageStorage;
 }
@@ -118,6 +187,7 @@ DEFINE_TRACE(FrameHost)
     visitor->trace(m_page);
     visitor->trace(m_topControls);
     visitor->trace(m_visualViewport);
+    visitor->trace(m_overscrollController);
     visitor->trace(m_eventHandlerRegistry);
     visitor->trace(m_consoleMessageStorage);
 }