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

Unified Diff: third_party/WebKit/Source/core/frame/FrameView.cpp

Issue 2273163002: Cleanup and refactor RootScrollerController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed class comment Created 4 years, 4 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
Index: third_party/WebKit/Source/core/frame/FrameView.cpp
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp
index c3f496da4b94c43f42b62f0714828eabb42218a3..51f5d2922d8c417c7320770ac053cd4b80b23aa8 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -82,9 +82,7 @@
#include "core/page/FocusController.h"
#include "core/page/FrameTree.h"
#include "core/page/Page.h"
-#include "core/page/scrolling/ChildViewportScrollCallback.h"
#include "core/page/scrolling/RootScrollerController.h"
-#include "core/page/scrolling/RootViewportScrollCallback.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
#include "core/paint/FramePainter.h"
#include "core/paint/PaintLayer.h"
@@ -2416,8 +2414,6 @@ void FrameView::didAttachDocument()
DCHECK(m_frame->document());
- ViewportScrollCallback* viewportScrollCallback = nullptr;
-
if (m_frame->isMainFrame()) {
ScrollableArea& visualViewport = frameHost->visualViewport();
ScrollableArea* layoutViewport = layoutViewportScrollableArea();
@@ -2426,16 +2422,7 @@ void FrameView::didAttachDocument()
RootFrameViewport* rootFrameViewport =
RootFrameViewport::create(visualViewport, *layoutViewport);
m_viewportScrollableArea = rootFrameViewport;
-
- viewportScrollCallback = RootViewportScrollCallback::create(
- &frameHost->topControls(),
- &frameHost->overscrollController(),
- *rootFrameViewport);
- } else {
- viewportScrollCallback = ChildViewportScrollCallback::create();
}
-
- m_frame->document()->initializeRootScroller(viewportScrollCallback);
}
void FrameView::updateScrollCorner()

Powered by Google App Engine
This is Rietveld 408576698