third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp - Issue 2638333007: Add compositor element id for scroll nodes in SPv2.

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/compositing/PropertyTreeManager.cpp

Issue 2638333007: Add compositor element id for scroll nodes in SPv2. (Closed)

Patch Set: Sync to head. Created 3 years, 11 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/compositing/PaintArtifactCompositorTest.cpp ('k') | third_party/WebKit/Source/platform/graphics/paint/ScrollPaintPropertyNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp

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

index 3a58fa717bfd01cd5d48348c23141404cd32f360..ade03cb8d00f135b3d1c44aff673e1b71175df7c 100644

--- a/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp

+++ b/third_party/WebKit/Source/platform/graphics/compositing/PropertyTreeManager.cpp

@@ -134,6 +134,7 @@ void PropertyTreeManager::setupRootScrollNode() {

cc::ScrollTree& scrollTree = m_propertyTrees.scroll_tree;

scrollTree.clear();

m_propertyTrees.layer_id_to_scroll_node_index.clear();

+ m_propertyTrees.element_id_to_scroll_node_index.clear();

cc::ScrollNode& scrollNode =

*scrollTree.Node(scrollTree.Insert(cc::ScrollNode(), kRealRootNodeId));

DCHECK_EQ(scrollNode.id, kSecondaryRootNodeId);

@@ -267,6 +268,11 @@ int PropertyTreeManager::ensureCompositorScrollNode(

ensureCompositorTransformNode(scrollNode->scrollOffsetTranslation());

compositorNode.main_thread_scrolling_reasons =

scrollNode->mainThreadScrollingReasons();

+ CompositorElementId compositorElementId = scrollNode->compositorElementId();

+ if (compositorElementId) {

+ compositorNode.element_id = compositorElementId;

+ m_propertyTrees.element_id_to_scroll_node_index[compositorElementId] = id;

+ }

auto result = m_scrollNodeMap.set(scrollNode, id);

DCHECK(result.isNewEntry);