Imported WebKit commit 68645295d2e3e09af2c942f092556f06aa5f8b0d (http://svn.webkit.org/repository/webkit/trunk@128073)

New snapshot

1 files changed, 14 insertions, 9 deletions

diff --git a/Source/WebKit/chromium/src/WebAnimationImpl.cpp b/Source/WebKit/chromium/src/WebAnimationImpl.cpp
index e5d9ef2a3..b5a94d714 100644
--- a/Source/WebKit/chromium/src/WebAnimationImpl.cpp
+++ b/Source/WebKit/chromium/src/WebAnimationImpl.cpp
@@ -26,7 +26,6 @@
 
 #include "WebAnimationImpl.h"
 
-#include "AnimationIdVendor.h"
 #include "CCActiveAnimation.h"
 #include "CCAnimationCurve.h"
 #include "WebFloatAnimationCurveImpl.h"
@@ -36,23 +35,24 @@
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
-using WebCore::AnimationIdVendor;
 using WebCore::CCActiveAnimation;
 
 namespace WebKit {
 
-WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetProperty targetProperty)
+WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetProperty targetProperty, int animationId)
 {
-    return WebAnimation::create(curve, AnimationIdVendor::getNextAnimationId(), AnimationIdVendor::getNextGroupId(), targetProperty);
+    return new WebAnimationImpl(curve, targetProperty, animationId, 0);
 }
 
-WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, int animationId, int groupId, TargetProperty targetProperty)
+WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
 {
-    return new WebAnimationImpl(curve, animationId, groupId, targetProperty);
-}
+    static int nextAnimationId = 1;
+    static int nextGroupId = 1;
+    if (!animationId)
+        animationId = nextAnimationId++;
+    if (!groupId)
+        groupId = nextGroupId++;
 
-WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, int animationId, int groupId, TargetProperty targetProperty)
-{
     WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
     OwnPtr<WebCore::CCAnimationCurve> curve;
     switch (curveType) {
@@ -74,6 +74,11 @@ WebAnimationImpl::~WebAnimationImpl()
 {
 }
 
+int WebAnimationImpl::id()
+{
+    return m_animation->id();
+}
+
 WebAnimation::TargetProperty WebAnimationImpl::targetProperty() const
 {
     return static_cast<WebAnimationImpl::TargetProperty>(m_animation->targetProperty());