Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

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
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;

Powered by Google App Engine
This is Rietveld 408576698