Refactoring animation code in accelerated path.

Source/core/platform/graphics/GraphicsLayer.h

Index: Source/core/platform/graphics/GraphicsLayer.h
diff --git a/Source/core/platform/graphics/GraphicsLayer.h b/Source/core/platform/graphics/GraphicsLayer.h
index ddd26099d6b618785f91e051be3772484ab30734..74b5fd1140e81f07c4975af023efd08a7eadbc9e 100644
--- a/Source/core/platform/graphics/GraphicsLayer.h
+++ b/Source/core/platform/graphics/GraphicsLayer.h
@@ -27,8 +27,6 @@
 #ifndef GraphicsLayer_h
 #define GraphicsLayer_h
 
-#include "core/platform/animation/CSSAnimationData.h"
-#include "core/platform/animation/KeyframeValueList.h"
 #include "core/platform/graphics/Color.h"
 #include "core/platform/graphics/FloatPoint.h"
 #include "core/platform/graphics/FloatPoint3D.h"
@@ -39,7 +37,6 @@
 #include "core/platform/graphics/filters/FilterOperations.h"
 #include "core/platform/graphics/transforms/TransformationMatrix.h"
 
-#include "wtf/HashMap.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/PassOwnPtr.h"
 #include "wtf/Vector.h"
@@ -55,6 +52,7 @@
 
 namespace WebKit {
 class GraphicsLayerFactoryChromium;
+class WebAnimation;
 class WebLayer;
 }
 
@@ -219,15 +217,12 @@ public:
     IntRect contentsRect() const { return m_contentsRect; }
     void setContentsRect(const IntRect&);
 
-    // Transitions are identified by a special animation name that cannot clash with a keyframe identifier.
-    static String animationNameForTransition(AnimatedPropertyID);
-
     // Return true if the animation is handled by the compositing system. If this returns
     // false, the animation will be run by AnimationController.
     // These methods handle both transitions and keyframe animations.
-    bool addAnimation(const KeyframeValueList&, const IntSize& /*boxSize*/, const CSSAnimationData*, const String& /*animationName*/, double /*timeOffset*/);
-    void pauseAnimation(const String& /*animationName*/, double /*timeOffset*/);
-    void removeAnimation(const String& /*animationName*/);
+    bool addAnimation(WebKit::WebAnimation*);
+    void pauseAnimation(int animationId, double /*timeOffset*/);
+    void removeAnimation(int animationId);
 
     void suspendAnimations(double time);
     void resumeAnimations();
@@ -410,9 +405,6 @@ private:
 
     ContentsLayerPurpose m_contentsLayerPurpose;
 
-    typedef HashMap<String, int> AnimationIdMap;
-    AnimationIdMap m_animationIdMap;
-
     ScrollableArea* m_scrollableArea;
     WebKit::WebCompositingReasons m_compositingReasons;
 };