third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp - Issue 1944623002: CC Animation: Use ElementId to attach CC animation players.

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

Issue 1944623002: CC Animation: Use ElementId to attach CC animation players. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@erasedomids

Patch Set: Let CC clients generate their own ElementIds locally. Created 4 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

« third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp ('K') | « third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp ('k') | third_party/WebKit/Source/platform/animation/CompositorAnimationPlayer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

diff --git a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

index ecc21935aeb22a08648b8836afadf4c2506fd479..8a9d4fed5aa547b0e510763d7dd7264733a30bee 100644

--- a/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

+++ b/third_party/WebKit/Source/core/layout/compositing/PaintLayerCompositor.cpp

@@ -404,14 +404,12 @@ void PaintLayerCompositor::updateIfNeeded()

if (updateType != CompositingUpdateNone) {

if (RuntimeEnabledFeatures::compositorWorkerEnabled() && m_scrollLayer) {

if (Element* scrollingElement = m_layoutView.document().scrollingElement()) {

- CompositorElementId elementId = 0;

uint32_t mutableProperties = CompositorMutableProperty::kNone;

if (scrollingElement->hasCompositorProxy()) {

- elementId = scrollingElement->assignCompositorElementId();

+ m_scrollLayer->setElementId(scrollingElement->assignCompositorElementId());

CompositorIdToElementMap::registerElement(*scrollingElement);

mutableProperties = (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop) & scrollingElement->compositorMutableProperties();

}

- m_scrollLayer->setElementId(elementId);

m_scrollLayer->setCompositorMutableProperties(mutableProperties);

}