Use element id's for animations

third_party/WebKit/Source/core/animation/CompositorAnimations.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 19 matching lines @@
 
 #include "core/animation/CompositorAnimations.h"
 
 #include "core/animation/AnimationEffect.h"
 #include "core/animation/CompositorAnimationsImpl.h"
 #include "core/animation/ElementAnimations.h"
 #include "core/animation/animatable/AnimatableDouble.h"
 #include "core/animation/animatable/AnimatableFilterOperations.h"
 #include "core/animation/animatable/AnimatableTransform.h"
 #include "core/animation/animatable/AnimatableValue.h"
+#include "core/dom/DOMNodeIds.h"
 #include "core/layout/LayoutBoxModelObject.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/paint/PaintLayer.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/AnimationTranslationUtil.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationPlayer.h"
 #include "platform/animation/CompositorFilterAnimationCurve.h"
 #include "platform/animation/CompositorFilterKeyframe.h"
@@ skipping 333 matching lines @@
 
     if (!canStartAnimationOnCompositor(element)) {
         ASSERT_NOT_REACHED();
         return;
     }
     CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
     ASSERT(compositorPlayer);
     compositorPlayer->pauseAnimation(id, pauseTime);
 }
 
-bool CompositorAnimations::canAttachCompositedLayers(const Element& element, const Animation& animation)
+void CompositorAnimations::attachCompositedLayers(Element& element, const Animation& animation)
 {
     if (!animation.compositorPlayer())
-        return false;
-
-    if (!element.layoutObject() || !element.layoutObject()->isBoxModelObject())
-        return false;
-
-    PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
-
-    if (!layer || !layer->isAllowedToQueryCompositingState()
-        || !layer->compositedLayerMapping()
-        || !layer->compositedLayerMapping()->mainGraphicsLayer())
-        return false;
-
-    if (!layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer())
-        return false;
-
-    return true;
-}
-
-void CompositorAnimations::attachCompositedLayers(const Element& element, const Animation& animation)
-{
-    ASSERT(element.layoutObject());
-
-    PaintLayer* layer = toLayoutBoxModelObject(element.layoutObject())->layer();
-    ASSERT(layer);
+        return;
 
     CompositorAnimationPlayer* compositorPlayer = animation.compositorPlayer();
-    ASSERT(compositorPlayer);
-
-    ASSERT(layer->compositedLayerMapping());
-    compositorPlayer->attachLayer(layer->compositedLayerMapping()->mainGraphicsLayer()->platformLayer());
+    compositorPlayer->attachElement(CompositorElementId(DOMNodeIds::idForNode(&element)));

[Ian Vollick, 2016/06/01 18:08:26]

By not pulling from cc, we are able to simplify this code considerably.

 }
 
 // -----------------------------------------------------------------------
 // CompositorAnimationsImpl
 // -----------------------------------------------------------------------
 
 bool CompositorAnimationsImpl::convertTimingForCompositor(const Timing& timing, double timeOffset, CompositorTiming& out, double animationPlaybackRate)
 {
     timing.assertValid();
 
@@ skipping 237 matching lines @@
             break;
         default:
             ASSERT_NOT_REACHED();
         }
         animations.append(std::move(animation));
     }
     ASSERT(!animations.isEmpty());
 }
 
 } // namespace blink