third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.cpp - Issue 2877033002: Fix cc scrollbar layer issues with initialization, and use element ids throughout.

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 2877033002: Fix cc scrollbar layer issues with initialization, and use element ids throughout. (Closed)

Patch Set: none Created 3 years, 7 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/platform/graphics/CompositorElementIdTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/CompositorMutableStateTest.cpp » ('j') | no next file with comments »
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 d80dd61f5d2d94cb5f8e3a4c91e88c0358440e2a..c4b046ed7b2d5315d58cbea1cbe33ddfaea74c01 100644

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

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

@@ -24,10 +24,12 @@ CompositorMutableStateProvider::~CompositorMutableStateProvider() {}

std::unique_ptr<CompositorMutableState>

CompositorMutableStateProvider::GetMutableStateFor(uint64_t element_id) {

- cc::LayerImpl* main_layer = tree_->LayerByElementId(

- CreateCompositorElementId(element_id, CompositorSubElementId::kPrimary));

- cc::LayerImpl* scroll_layer = tree_->LayerByElementId(

- CreateCompositorElementId(element_id, CompositorSubElementId::kScroll));

+ cc::LayerImpl* main_layer =

+ tree_->LayerByElementId(CompositorElementIdFromDOMNodeId(

+ element_id, CompositorElementIdNamespace::kPrimary));

+ cc::LayerImpl* scroll_layer =

+ tree_->LayerByElementId(CompositorElementIdFromDOMNodeId(

+ element_id, CompositorElementIdNamespace::kScroll));

if (!main_layer && !scroll_layer)

return nullptr;