Rolls cc and webkit_compositor up to 127340

webkit/compositor/WebAnimationImpl.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "WebAnimationImpl.h"
 
 #include "CCActiveAnimation.h"
 #include "CCAnimationCurve.h"
 #include "WebFloatAnimationCurveImpl.h"
 #include "WebTransformAnimationCurveImpl.h"
 #include <public/WebAnimation.h>
 #include <public/WebAnimationCurve.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
 using WebCore::CCActiveAnimation;
 
 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) {
     case WebAnimationCurve::AnimationCurveTypeFloat: {
         const WebFloatAnimationCurveImpl* floatCurveImpl = static_cast<const WebFloatAnimationCurveImpl*>(&webCurve);
         curve = floatCurveImpl->cloneToCCAnimationCurve();
         break;
     }
     case WebAnimationCurve::AnimationCurveTypeTransform: {
         const WebTransformAnimationCurveImpl* transformCurveImpl = static_cast<const WebTransformAnimationCurveImpl*>(&webCurve);
@@ skipping 59 matching lines @@
 }
 
 PassOwnPtr<WebCore::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation()
 {
     OwnPtr<WebCore::CCActiveAnimation> toReturn(m_animation->clone(WebCore::CCActiveAnimation::NonControllingInstance));
     toReturn->setNeedsSynchronizedStartTime(true);
     return toReturn.release();
 }
 
 } // namespace WebKit