third_party/WebKit/Source/core/dom/Document.cpp - Issue 2128543002: Make ViewportScrollCallback an interface and add child and root classes

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 2128543002: Make ViewportScrollCallback an interface and add child and root classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveViewportCreationToDocumentAttachment

Patch Set: Rebase Created 4 years, 5 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/core.gypi ('k') | third_party/WebKit/Source/core/page/scrolling/ChildViewportScrollCallback.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 063abb03f90b2b3e0d45974732d43eafb74beb80..404aa19578c1ea05a6455f1637beee564da6d90c 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -195,11 +195,12 @@

#include "core/page/FrameTree.h"

#include "core/page/Page.h"

#include "core/page/PointerLockController.h"

+#include "core/page/scrolling/ChildViewportScrollCallback.h"

#include "core/page/scrolling/RootScrollerController.h"

+#include "core/page/scrolling/RootViewportScrollCallback.h"

#include "core/page/scrolling/ScrollStateCallback.h"

#include "core/page/scrolling/ScrollingCoordinator.h"

#include "core/page/scrolling/SnapCoordinator.h"

-#include "core/page/scrolling/ViewportScrollCallback.h"

#include "core/svg/SVGDocumentExtensions.h"

#include "core/svg/SVGScriptElement.h"

#include "core/svg/SVGTitleElement.h"

@@ -462,11 +463,11 @@ Document::Document(const DocumentInit& initializer, DocumentClassFlags documentC

ViewportScrollCallback* applyScroll = nullptr;

if (isInMainFrame()) {

- applyScroll = RootScrollerController::createViewportApplyScroll(

+ applyScroll = RootViewportScrollCallback::create(

&frameHost()->topControls(), &frameHost()->overscrollController());

} else {

applyScroll =

- RootScrollerController::createViewportApplyScroll(nullptr, nullptr);

+ ChildViewportScrollCallback::create();

}

m_rootScrollerController =