CC Animation: Use ElementId to attach CC animation players.

third_party/WebKit/Source/core/animation/Animation.cpp

Index: third_party/WebKit/Source/core/animation/Animation.cpp
diff --git a/third_party/WebKit/Source/core/animation/Animation.cpp b/third_party/WebKit/Source/core/animation/Animation.cpp
index 3ead492e4428242e17e4cd57f018dcd868863273..96d5aa1fcaa21b5f490b6c0010893cd54c185b2c 100644
--- a/third_party/WebKit/Source/core/animation/Animation.cpp
+++ b/third_party/WebKit/Source/core/animation/Animation.cpp
@@ -909,12 +909,12 @@ void Animation::createCompositorPlayer()
         attachCompositorTimeline();
     }
 
-    attachCompositedLayers();
+    attachCompositorPlayerToElement();
 }
 
 void Animation::destroyCompositorPlayer()
 {
-    detachCompositedLayers();
+    detachCompositorPlayerFromElement();
 
     if (m_compositorPlayer) {
         detachCompositorTimeline();
@@ -941,7 +941,7 @@ void Animation::detachCompositorTimeline()
     }
 }
 
-void Animation::attachCompositedLayers()
+void Animation::attachCompositorPlayerToElement()
 {
     if (!m_compositorPlayer)
         return;
@@ -949,14 +949,14 @@ void Animation::attachCompositedLayers()
     ASSERT(m_content);
     ASSERT(m_content->isKeyframeEffect());
 
-    if (toKeyframeEffect(m_content.get())->canAttachCompositedLayers())
-        toKeyframeEffect(m_content.get())->attachCompositedLayers();
+    if (toKeyframeEffect(m_content.get())->canAttachCompositorPlayerToElement())
+        toKeyframeEffect(m_content.get())->attachCompositorPlayerToElement();
 }
 
-void Animation::detachCompositedLayers()
+void Animation::detachCompositorPlayerFromElement()
 {
-    if (m_compositorPlayer && m_compositorPlayer->isLayerAttached())
-        m_compositorPlayer->detachLayer();
+    if (m_compositorPlayer && m_compositorPlayer->isElementAttached())
+        m_compositorPlayer->detachElement();
 }
 
 void Animation::notifyAnimationStarted(double monotonicTime, int group)