| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "web_animation_impl.h" | 5 #include "web_animation_impl.h" |
| 6 | 6 |
| 7 #include "cc/active_animation.h" | 7 #include "cc/active_animation.h" |
| 8 #include "cc/animation_curve.h" | 8 #include "cc/animation_curve.h" |
| 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h
" | 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h
" |
| 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" | 10 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" |
| 11 #include "web_float_animation_curve_impl.h" | 11 #include "web_float_animation_curve_impl.h" |
| 12 #include "web_transform_animation_curve_impl.h" | 12 #include "web_transform_animation_curve_impl.h" |
| 13 | 13 |
| 14 using cc::ActiveAnimation; | 14 using cc::ActiveAnimation; |
| 15 | 15 |
| 16 namespace WebKit { | 16 namespace WebKit { |
| 17 | 17 |
| 18 WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetPropert
y targetProperty, int animationId) | |
| 19 { | |
| 20 return new WebAnimationImpl(curve, targetProperty, animationId, 0); | |
| 21 } | |
| 22 | |
| 23 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
erty targetProperty, int animationId, int groupId) | 18 WebAnimationImpl::WebAnimationImpl(const WebAnimationCurve& webCurve, TargetProp
erty targetProperty, int animationId, int groupId) |
| 24 { | 19 { |
| 25 static int nextAnimationId = 1; | 20 static int nextAnimationId = 1; |
| 26 static int nextGroupId = 1; | 21 static int nextGroupId = 1; |
| 27 if (!animationId) | 22 if (!animationId) |
| 28 animationId = nextAnimationId++; | 23 animationId = nextAnimationId++; |
| 29 if (!groupId) | 24 if (!groupId) |
| 30 groupId = nextGroupId++; | 25 groupId = nextGroupId++; |
| 31 | 26 |
| 32 WebAnimationCurve::AnimationCurveType curveType = webCurve.type(); | 27 WebAnimationCurve::AnimationCurveType curveType = webCurve.type(); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 } | 96 } |
| 102 | 97 |
| 103 scoped_ptr<cc::ActiveAnimation> WebAnimationImpl::cloneToAnimation() | 98 scoped_ptr<cc::ActiveAnimation> WebAnimationImpl::cloneToAnimation() |
| 104 { | 99 { |
| 105 scoped_ptr<cc::ActiveAnimation> toReturn(m_animation->clone(cc::ActiveAnimat
ion::NonControllingInstance)); | 100 scoped_ptr<cc::ActiveAnimation> toReturn(m_animation->clone(cc::ActiveAnimat
ion::NonControllingInstance)); |
| 106 toReturn->setNeedsSynchronizedStartTime(true); | 101 toReturn->setNeedsSynchronizedStartTime(true); |
| 107 return toReturn.Pass(); | 102 return toReturn.Pass(); |
| 108 } | 103 } |
| 109 | 104 |
| 110 } // namespace WebKit | 105 } // namespace WebKit |
| OLD | NEW |