third_party/WebKit/Source/core/input/ScrollManager.cpp - Issue 2113483002: Make RootScroller set the outer viewport scroll layer in the compositor

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/input/ScrollManager.cpp

Issue 2113483002: Make RootScroller set the outer viewport scroll layer in the compositor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« cc/trees/root_scroller_controller.h ('K') | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/page/ChromeClient.h » ('j') | third_party/WebKit/Source/core/page/scrolling/RootScrollerController.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/input/ScrollManager.cpp

diff --git a/third_party/WebKit/Source/core/input/ScrollManager.cpp b/third_party/WebKit/Source/core/input/ScrollManager.cpp

index 4ca799892a2a219453212646642ccb51d029d110..e5ff517a70663db09b5f44b94d02c489b5ec8888 100644

--- a/third_party/WebKit/Source/core/input/ScrollManager.cpp

+++ b/third_party/WebKit/Source/core/input/ScrollManager.cpp

@@ -16,6 +16,7 @@

#include "core/page/AutoscrollController.h"

#include "core/page/Page.h"

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

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

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

#include "core/paint/PaintLayer.h"

#include "platform/PlatformGestureEvent.h"

@@ -350,7 +351,7 @@ bool ScrollManager::isEffectiveRootScroller(const Node& node) const

if (!node.isElementNode())

return false;

- return node.isSameNode(m_frame->document()->effectiveRootScroller());

+ return node.isSameNode(m_frame->document()->rootScrollerController()->effectiveRootScroller());

}