Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp - Issue 10310152: Merge 116786 - [chromium] Ensure that animations continue to run when transform-style is changed

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: Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

Issue 10310152: Merge 116786 - [chromium] Ensure that animations continue to run when transform-style is changed (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1132/

Patch Set: Created 8 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 | « LayoutTests/animations/change-transform-style-during-animation-expected.txt ('k') | Source/WebCore/platform/graphics/chromium/LayerChromium.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

===================================================================

--- Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (revision 116996)

+++ Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (working copy)

@@ -588,6 +588,7 @@

m_transformLayer = LayerChromium::create();

m_transformLayer->setPreserves3D(true);

m_transformLayer->setLayerAnimationDelegate(this);

+ m_transformLayer->setLayerAnimationController(m_layer->releaseLayerAnimationController());

// Copy the position from this layer.

updateLayerPosition();

@@ -619,6 +620,9 @@

if (m_transformLayer->parent())

m_transformLayer->parent()->replaceChild(m_transformLayer.get(), m_layer.get());

+ m_layer->setLayerAnimationDelegate(this);

+ m_layer->setLayerAnimationController(m_transformLayer->releaseLayerAnimationController());

// Release the transform layer.

m_transformLayer->setLayerAnimationDelegate(0);

m_transformLayer = 0;