CC Animation: Use ElementId to attach CC animation players.

third_party/WebKit/Source/core/animation/KeyframeEffect.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 27 matching lines @@
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/Interpolation.h"
 #include "core/animation/KeyframeEffectModel.h"
 #include "core/animation/KeyframeEffectOptions.h"
 #include "core/animation/PropertyHandle.h"
 #include "core/dom/Element.h"
 #include "core/dom/NodeComputedStyle.h"
 #include "core/frame/UseCounter.h"
 #include "core/paint/PaintLayer.h"
 #include "core/svg/SVGElement.h"
+#include "platform/animation/CompositorAnimationPlayer.h"
 
 namespace blink {
 
 KeyframeEffect* KeyframeEffect::create(Element* target, EffectModel* model, const Timing& timing, Priority priority, EventDelegate* eventDelegate)
 {
     return new KeyframeEffect(target, model, timing, priority, eventDelegate);
 }
 
 KeyframeEffect* KeyframeEffect::create(ExecutionContext* executionContext, Element* element, const EffectModelOrDictionarySequenceOrDictionary& effectInput, double duration, ExceptionState& exceptionState)
 {
@@ skipping 289 matching lines @@
 void KeyframeEffect::pauseAnimationForTestingOnCompositor(double pauseTime)
 {
     ASSERT(hasActiveAnimationsOnCompositor());
     if (!m_target || !m_target->layoutObject())
         return;
     ASSERT(animation());
     for (const auto& compositorAnimationId : m_compositorAnimationIds)
         CompositorAnimations::instance()->pauseAnimationForTestingOnCompositor(*m_target, *animation(), compositorAnimationId, pauseTime);
 }
 
-bool KeyframeEffect::canAttachCompositedLayers() const
+bool KeyframeEffect::canAttachCompositorPlayerToElement() const
 {
-    if (!m_target || !animation())
-        return false;
-
-    return CompositorAnimations::instance()->canAttachCompositedLayers(*m_target, *animation());
+    return m_target && animation() && animation()->compositorPlayer();
 }
 
-void KeyframeEffect::attachCompositedLayers()
+void KeyframeEffect::attachCompositorPlayerToElement()
 {
     ASSERT(m_target);
     ASSERT(animation());
-    CompositorAnimations::instance()->attachCompositedLayers(*m_target, *animation());
+    ASSERT(animation()->compositorPlayer());
+    animation()->compositorPlayer()->attachElement(m_target->compositorElementId());
 }
 
 DEFINE_TRACE(KeyframeEffect)
 {
     visitor->trace(m_target);
     visitor->trace(m_model);
     visitor->trace(m_sampledEffect);
     AnimationEffect::trace(visitor);
 }
 
 } // namespace blink