Merge 116786 - [chromium] Ensure that animations continue to run when transform-style is changed

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

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 570 matching lines @@
     updateDebugIndicators();
 }
 
 void GraphicsLayerChromium::updateLayerPreserves3D()
 {
     if (m_preserves3D && !m_transformLayer) {
         // Create the transform layer.
         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();
         updateLayerSize();
         updateAnchorPoint();
         updateTransform();
         updateChildrenTransform();
 
         m_layer->setPosition(FloatPoint(m_size.width() / 2.0f, m_size.height() / 2.0f));
 
@@ skipping 11 matching lines @@
             m_layer->parent()->replaceChild(m_layer.get(), m_transformLayer.get());
         m_transformLayer->addChild(m_layer.get());
 
         updateChildList();
     } else if (!m_preserves3D && m_transformLayer) {
         // Relace the transformLayer in the parent with this layer.
         m_layer->removeFromParent();
         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;
 
         updateLayerPosition();
         updateLayerSize();
         updateAnchorPoint();
         updateTransform();
         updateChildrenTransform();
 
@@ skipping 129 matching lines @@
 }
 
 void GraphicsLayerChromium::notifyAnimationFinished(double)
 {
     // Do nothing.
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)