third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp - Issue 2292133002: [compositor-worker] root scrolling layer is associated with document scrolling element

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/platform/graphics/CompositorMutableStateProvider.cpp

Issue 2292133002: [compositor-worker] root scrolling layer is associated with document scrolling element

Patch Set: Use document instead of documentElement() Created 3 years, 10 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

« third_party/WebKit/Source/core/dom/CompositorProxy.cpp ('K') | « third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h ('k') | third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp » ('j') | third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

index e5b2392656b9b51e6ebe5048457ad5b56642541a..266fe28ddcfeca2b26b5b5e2f76df025e217f6dd 100644

--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp

@@ -23,11 +23,14 @@ CompositorMutableStateProvider::CompositorMutableStateProvider(

CompositorMutableStateProvider::~CompositorMutableStateProvider() {}

std::unique_ptr<CompositorMutableState>

-CompositorMutableStateProvider::getMutableStateFor(uint64_t elementId) {

+CompositorMutableStateProvider::getMutableStateFor(

+ uint64_t elementId,

+ uint64_t scrollingElementId) {

cc::LayerImpl* mainLayer = m_tree->LayerByElementId(

createCompositorElementId(elementId, CompositorSubElementId::Primary));

- cc::LayerImpl* scrollLayer = m_tree->LayerByElementId(

- createCompositorElementId(elementId, CompositorSubElementId::Scroll));

+ cc::LayerImpl* scrollLayer =

+ m_tree->LayerByElementId(createCompositorElementId(

+ scrollingElementId, CompositorSubElementId::Scroll));

if (!mainLayer && !scrollLayer)

return nullptr;