Use element id's for animations

third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
index 1d58966e8e2a1064ab64e156e5355ffdc1d45e2c..47574e356b50b9f30a0bdcfd4f032b0b1b02b1e4 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -10,6 +10,7 @@
 #include "platform/animation/CompositorAnimationPlayer.h"
 #include "platform/animation/CompositorAnimationTimeline.h"
 #include "platform/graphics/CompositorFactory.h"
+#include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
 #include "public/platform/Platform.h"
@@ -18,7 +19,7 @@
 namespace blink {
 
 ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
-    : m_compositorAnimationAttachedToLayerId(0)
+    : m_compositorAnimationAttachedToElementId(0)
     , m_runState(RunState::Idle)
     , m_compositorAnimationId(0)
     , m_compositorAnimationGroupId(0)
@@ -78,7 +79,7 @@ bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() cons
 bool ScrollAnimatorCompositorCoordinator::addAnimation(
     PassOwnPtr<CompositorAnimation> animation)
 {
-    if (m_compositorPlayer->isLayerAttached()) {
+    if (m_compositorPlayer->isElementAttached()) {
         m_compositorPlayer->addAnimation(animation.leakPtr());
         return true;
     }
@@ -87,13 +88,13 @@ bool ScrollAnimatorCompositorCoordinator::addAnimation(
 
 void ScrollAnimatorCompositorCoordinator::removeAnimation()
 {
-    if (m_compositorPlayer->isLayerAttached())
+    if (m_compositorPlayer->isElementAttached())
         m_compositorPlayer->removeAnimation(m_compositorAnimationId);
 }
 
 void ScrollAnimatorCompositorCoordinator::abortAnimation()
 {
-    if (m_compositorPlayer->isLayerAttached())
+    if (m_compositorPlayer->isElementAttached())
         m_compositorPlayer->abortAnimation(m_compositorAnimationId);
 }
 
@@ -191,27 +192,28 @@ bool ScrollAnimatorCompositorCoordinator::reattachCompositorPlayerIfNeeded(
     CompositorAnimationTimeline* timeline)
 {
     bool reattached = false;
-    int compositorAnimationAttachedToLayerId = 0;
-    if (getScrollableArea()->layerForScrolling())
-        compositorAnimationAttachedToLayerId = getScrollableArea()->layerForScrolling()->platformLayer()->id();
+    CompositorElementId compositorAnimationAttachedToElementId;
+    if (getScrollableArea()->layerForScrolling()) {
+        compositorAnimationAttachedToElementId = getScrollableArea()->layerForScrolling()->platformLayer()->elementId();
+        DCHECK(compositorAnimationAttachedToElementId);
+    }
 
-    if (compositorAnimationAttachedToLayerId != m_compositorAnimationAttachedToLayerId) {
+    if (compositorAnimationAttachedToElementId != m_compositorAnimationAttachedToElementId) {
         if (m_compositorPlayer && timeline) {
             // Detach from old layer (if any).
-            if (m_compositorAnimationAttachedToLayerId) {
-                if (m_compositorPlayer->isLayerAttached())
-                    m_compositorPlayer->detachLayer();
+            if (m_compositorAnimationAttachedToElementId) {
+                if (m_compositorPlayer->isElementAttached())
+                    m_compositorPlayer->detachElement();
                 timeline->playerDestroyed(*this);
             }
             // Attach to new layer (if any).
-            if (compositorAnimationAttachedToLayerId) {
-                ASSERT(!m_compositorPlayer->isLayerAttached());
+            if (compositorAnimationAttachedToElementId) {
+                DCHECK(!m_compositorPlayer->isElementAttached());
                 timeline->playerAttached(*this);
-                m_compositorPlayer->attachLayer(
-                    getScrollableArea()->layerForScrolling()->platformLayer());
+                m_compositorPlayer->attachElement(compositorAnimationAttachedToElementId);
                 reattached = true;
             }
-            m_compositorAnimationAttachedToLayerId = compositorAnimationAttachedToLayerId;
+            m_compositorAnimationAttachedToElementId = compositorAnimationAttachedToElementId;
         }
     }
 
@@ -268,7 +270,7 @@ void ScrollAnimatorCompositorCoordinator::updateCompositorAnimations()
     CompositorAnimationTimeline* timeline = getScrollableArea()->compositorAnimationTimeline();
     if (layer && timeline && !timeline->compositorAnimationHost().isNull()) {
         CompositorAnimationHost host = timeline->compositorAnimationHost();
-        int elementId = layer->platformLayer()->id();
+        cc::ElementId elementId(layer->platformLayer()->id());
         if (!m_implOnlyAnimationAdjustment.isZero()) {
             host.adjustImplOnlyScrollOffsetAnimation(
                 elementId,