Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebAnimationImpl.cpp

Index: webkit/compositor/WebAnimationImpl.cpp
diff --git a/webkit/compositor/WebAnimationImpl.cpp b/webkit/compositor/WebAnimationImpl.cpp
index e7cc459eb4c357f8f633441e6eee5591d6b99c9e..bbae89bd254a324fe1bdbb95e352c1ec91868464 100644
--- a/webkit/compositor/WebAnimationImpl.cpp
+++ b/webkit/compositor/WebAnimationImpl.cpp
@@ -21,13 +21,18 @@ namespace WebKit {
 
 WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetProperty targetProperty, int animationId)
 {
-    static int nextGroupId = 1;
-    static int nextAnimationId = 1;
-    return new WebAnimationImpl(curve, targetProperty, animationId ? animationId : nextAnimationId++, nextGroupId++);
+    return new WebAnimationImpl(curve, targetProperty, animationId, 0);
 }
 
 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProperty targetProperty, int animationId, int groupId)
 {
+    static int nextAnimationId = 1;
+    static int nextGroupId = 1;
+    if (!animationId)
+        animationId = nextAnimationId++;
+    if (!groupId)
+        groupId = nextGroupId++;
+
     WebAnimationCurve::AnimationCurveType curveType = webCurve.type();
     OwnPtr<WebCore::CCAnimationCurve> curve;
     switch (curveType) {