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

Unified Diff: Source/WebCore/platform/graphics/chromium/LayerChromium.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/LayerChromium.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (revision 116996)
+++ Source/WebCore/platform/graphics/chromium/LayerChromium.cpp (working copy)
@@ -627,9 +627,20 @@
void LayerChromium::setLayerAnimationController(PassOwnPtr<CCLayerAnimationController> layerAnimationController)
{
m_layerAnimationController = layerAnimationController;
+ if (m_layerAnimationController) {
+ m_layerAnimationController->setClient(this);
+ m_layerAnimationController->setForceSync();
+ }
setNeedsCommit();
}
+PassOwnPtr<CCLayerAnimationController> LayerChromium::releaseLayerAnimationController()
+{
+ OwnPtr<CCLayerAnimationController> toReturn = m_layerAnimationController.release();
+ m_layerAnimationController = CCLayerAnimationController::create(this);
+ return toReturn.release();
+}
+
bool LayerChromium::hasActiveAnimation() const
{
return m_layerAnimationController->hasActiveAnimation();
@@ -638,7 +649,8 @@
void LayerChromium::notifyAnimationStarted(const CCAnimationEvent& event, double wallClockTime)
{
m_layerAnimationController->notifyAnimationStarted(event);
- m_layerAnimationDelegate->notifyAnimationStarted(wallClockTime);
+ if (m_layerAnimationDelegate)
+ m_layerAnimationDelegate->notifyAnimationStarted(wallClockTime);
}
void LayerChromium::notifyAnimationFinished(double wallClockTime)

Powered by Google App Engine
This is Rietveld 408576698