CC Animation: Use ElementId to attach CC animation players.

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

 /*
  * Copyright (C) 2013 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 891 matching lines @@
 void Animation::createCompositorPlayer()
 {
     if (Platform::current()->isThreadedAnimationEnabled() && !m_compositorPlayer) {
         ASSERT(Platform::current()->compositorSupport());
         m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
         ASSERT(m_compositorPlayer);
         m_compositorPlayer->setAnimationDelegate(this);
         attachCompositorTimeline();
     }
 
-    attachCompositedLayers();
+    attachCompositorPlayerToElement();
 }
 
 void Animation::destroyCompositorPlayer()
 {
-    detachCompositedLayers();
+    detachCompositorPlayerFromElement();
 
     if (m_compositorPlayer) {
         detachCompositorTimeline();
         m_compositorPlayer->setAnimationDelegate(nullptr);
         m_compositorPlayer.clear();
     }
 }
 
 void Animation::attachCompositorTimeline()
 {
     if (m_compositorPlayer) {
         CompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
         if (timeline)
             timeline->playerAttached(*this);
     }
 }
 
 void Animation::detachCompositorTimeline()
 {
     if (m_compositorPlayer) {
         CompositorAnimationTimeline* timeline = m_timeline ? m_timeline->compositorTimeline() : nullptr;
         if (timeline)
             timeline->playerDestroyed(*this);
     }
 }
 
-void Animation::attachCompositedLayers()
+void Animation::attachCompositorPlayerToElement()
 {
     if (!m_compositorPlayer)
         return;
 
     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)
 {
     timeline()->document()->compositorPendingAnimations().notifyCompositorAnimationStarted(monotonicTime, group);
 }
 
 Animation::PlayStateUpdateScope::PlayStateUpdateScope(Animation& animation, TimingUpdateReason reason, CompositorPendingChange compositorPendingChange)
     : m_animation(animation)
     , m_initialPlayState(m_animation->playStateInternal())
@@ skipping 115 matching lines @@
     visitor->trace(m_timeline);
     visitor->trace(m_pendingFinishedEvent);
     visitor->trace(m_pendingCancelledEvent);
     visitor->trace(m_finishedPromise);
     visitor->trace(m_readyPromise);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink