Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: third_party/WebKit/Source/core/page/Page.cpp

Issue 2729603005: Move m_overscrollController to Page (Closed)
Patch Set: Fixed small compile error Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/page/Page.cpp
diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp
index 77ab44c15a9206cef047b09cd40d7d9ee34fba45..c270afece7dce4ce28cfcfcf0fe0a347cd516e33 100644
--- a/third_party/WebKit/Source/core/page/Page.cpp
+++ b/third_party/WebKit/Source/core/page/Page.cpp
@@ -54,6 +54,7 @@
#include "core/page/PointerLockController.h"
#include "core/page/ScopedPageSuspender.h"
#include "core/page/ValidationMessageClient.h"
+#include "core/page/scrolling/OverscrollController.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
#include "core/page/scrolling/TopDocumentRootScrollerController.h"
#include "core/paint/PaintLayer.h"
@@ -112,6 +113,8 @@ Page::Page(PageClients& pageClients)
m_globalRootScrollerController(
TopDocumentRootScrollerController::create(*this)),
m_visualViewport(VisualViewport::create(*this)),
+ m_overscrollController(
+ OverscrollController::create(visualViewport(), chromeClient())),
m_mainFrame(nullptr),
m_editorClient(pageClients.editorClient),
m_spellCheckerClient(pageClients.spellCheckerClient),
@@ -206,6 +209,14 @@ const VisualViewport& Page::visualViewport() const {
return *m_visualViewport;
}
+OverscrollController& Page::overscrollController() {
+ return *m_overscrollController;
+}
+
+const OverscrollController& Page::overscrollController() const {
+ return *m_overscrollController;
+}
+
ClientRectList* Page::nonFastScrollableRects(const LocalFrame* frame) {
DisableCompositingQueryAsserts disabler;
if (ScrollingCoordinator* scrollingCoordinator =
@@ -588,6 +599,7 @@ DEFINE_TRACE(Page) {
visitor->trace(m_eventHandlerRegistry);
visitor->trace(m_globalRootScrollerController);
visitor->trace(m_visualViewport);
+ visitor->trace(m_overscrollController);
visitor->trace(m_mainFrame);
visitor->trace(m_validationMessageClient);
visitor->trace(m_useCounter);
« no previous file with comments | « third_party/WebKit/Source/core/page/Page.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698