Move overscroll logic out of EventHandler.

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

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "core/frame/FrameHost.h"
 
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/PageScaleConstraints.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #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"
 
 namespace blink {
 
 FrameHost* FrameHost::create(Page& page)
 {
     return new FrameHost(page);
 }
 
 FrameHost::FrameHost(Page& page)
     : m_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)
 {
 }
 
 // Explicitly in the .cpp to avoid default constructor in .h
 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();
 }
 
-UseCounter& FrameHost::useCounter() const
+const ChromeClient& FrameHost::chromeClient() const
+{
+    return m_page->chromeClient();
+}
+
+UseCounter& FrameHost::useCounter()
 {
     return m_page->useCounter();
 }
 
-Deprecation& FrameHost::deprecation() const
+const UseCounter& FrameHost::useCounter() const
+{
+    return m_page->useCounter();
+}
+
+Deprecation& FrameHost::deprecation()
 {
     return m_page->deprecation();
 }
+
+const Deprecation& FrameHost::deprecation() const
+{
+    return m_page->deprecation();
+}
 
 float FrameHost::deviceScaleFactor() const
 {
     return m_page->deviceScaleFactor();
 }
 
-TopControls& FrameHost::topControls() const
+TopControls& FrameHost::topControls()
 {
     return *m_topControls;
 }
 
-VisualViewport& FrameHost::visualViewport() const
+const TopControls& FrameHost::topControls() const
+{
+    return *m_topControls;
+}
+
+OverscrollController& FrameHost::overscrollController()
+{
+    return *m_overscrollController;
+}
+
+const OverscrollController& FrameHost::overscrollController() const
+{
+    return *m_overscrollController;
+}
+
+VisualViewport& FrameHost::visualViewport()
 {
     return *m_visualViewport;
 }
 
-PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const
+const VisualViewport& FrameHost::visualViewport() const
+{
+    return *m_visualViewport;
+}
+
+PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet()
 {
     return *m_pageScaleConstraintsSet;
 }
 
-EventHandlerRegistry& FrameHost::eventHandlerRegistry() const
+const PageScaleConstraintsSet& FrameHost::pageScaleConstraintsSet() const
+{
+    return *m_pageScaleConstraintsSet;
+}
+
+EventHandlerRegistry& FrameHost::eventHandlerRegistry()
 {
     return *m_eventHandlerRegistry;
 }
 
-ConsoleMessageStorage& FrameHost::consoleMessageStorage() const
+const EventHandlerRegistry& FrameHost::eventHandlerRegistry() const
+{
+    return *m_eventHandlerRegistry;
+}
+
+ConsoleMessageStorage& FrameHost::consoleMessageStorage()
 {
     return *m_consoleMessageStorage;
 }
+
+const ConsoleMessageStorage& FrameHost::consoleMessageStorage() const
+{
+    return *m_consoleMessageStorage;
+}
 
 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);
 }
 
 #if ENABLE(ASSERT)
 void checkFrameCountConsistency(int expectedFrameCount, Frame* frame)
 {
     ASSERT(expectedFrameCount >= 0);
 
     int actualFrameCount = 0;
@@ skipping 48 matching lines @@
 
     FrameView* rootView = page().deprecatedLocalMainFrame()->view();
 
     if (!rootView)
         return;
 
     rootView->setNeedsLayout();
 }
 
 } // namespace blink