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

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

Issue 2285253003: Move TopDocumentRootScrollerController to a separate object on FrameHost (Closed)
Patch Set: None 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 71792af157bf1f06cdd511e66c8657160bc73b03..b6d0b1f284338c67c91938750a0b5fe0113dfff4 100644
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp
@@ -82,8 +82,8 @@
#include "core/page/FocusController.h"
#include "core/page/FrameTree.h"
#include "core/page/Page.h"
-#include "core/page/scrolling/RootScrollerController.h"
#include "core/page/scrolling/ScrollingCoordinator.h"
+#include "core/page/scrolling/TopDocumentRootScrollerController.h"
#include "core/paint/FramePainter.h"
#include "core/paint/PaintLayer.h"
#include "core/paint/PrePaintTreeWalk.h"
@@ -2422,6 +2422,9 @@ void FrameView::didAttachDocument()
RootFrameViewport* rootFrameViewport =
RootFrameViewport::create(visualViewport, *layoutViewport);
m_viewportScrollableArea = rootFrameViewport;
+
+ frameHost->globalRootScrollerController()
+ .initializeViewportScrollCallback(*rootFrameViewport);
}
}
@@ -2613,6 +2616,8 @@ void FrameView::updateLifecyclePhasesInternal(DocumentLifecycle::LifecycleState
DCHECK(lifecycle().state() >= DocumentLifecycle::CompositingClean);
+ m_frame->host()->globalRootScrollerController().didUpdateCompositing();
+
if (targetState >= DocumentLifecycle::PrePaintClean) {
if (!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled())
invalidateTreeIfNeededRecursive();

Powered by Google App Engine
This is Rietveld 408576698