| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "WebAnimationImpl.h" | 7 #include "web_animation_impl.h" |
| 8 | 8 |
| 9 #include "WebFloatAnimationCurveImpl.h" | |
| 10 #include "WebTransformAnimationCurveImpl.h" | |
| 11 #include "cc/active_animation.h" | 9 #include "cc/active_animation.h" |
| 12 #include "cc/animation_curve.h" | 10 #include "cc/animation_curve.h" |
| 11 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h
" |
| 13 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" | 12 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" |
| 14 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimationCurve.h
" | 13 #include "web_float_animation_curve_impl.h" |
| 14 #include "web_transform_animation_curve_impl.h" |
| 15 | 15 |
| 16 using cc::CCActiveAnimation; | 16 using cc::CCActiveAnimation; |
| 17 | 17 |
| 18 namespace WebKit { | 18 namespace WebKit { |
| 19 | 19 |
| 20 WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetPropert
y targetProperty, int animationId) | 20 WebAnimation* WebAnimation::create(const WebAnimationCurve& curve, TargetPropert
y targetProperty, int animationId) |
| 21 { | 21 { |
| 22 return new WebAnimationImpl(curve, targetProperty, animationId, 0); | 22 return new WebAnimationImpl(curve, targetProperty, animationId, 0); |
| 23 } | 23 } |
| 24 | 24 |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 103 } | 103 } |
| 104 | 104 |
| 105 scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation() | 105 scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation() |
| 106 { | 106 { |
| 107 scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAn
imation::NonControllingInstance)); | 107 scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAn
imation::NonControllingInstance)); |
| 108 toReturn->setNeedsSynchronizedStartTime(true); | 108 toReturn->setNeedsSynchronizedStartTime(true); |
| 109 return toReturn.Pass(); | 109 return toReturn.Pass(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 } // namespace WebKit | 112 } // namespace WebKit |
| OLD | NEW |