| 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 "WebAnimationImpl.h" |
| 8 | 8 |
| 9 #include "CCActiveAnimation.h" | 9 #include "cc/active_animation.h" |
| 10 #include "CCAnimationCurve.h" | 10 #include "cc/animation_curve.h" |
| 11 #include "WebFloatAnimationCurveImpl.h" | 11 #include "WebFloatAnimationCurveImpl.h" |
| 12 #include "WebTransformAnimationCurveImpl.h" | 12 #include "WebTransformAnimationCurveImpl.h" |
| 13 #include <public/WebAnimation.h> | 13 #include <public/WebAnimation.h> |
| 14 #include <public/WebAnimationCurve.h> | 14 #include <public/WebAnimationCurve.h> |
| 15 #include <wtf/OwnPtr.h> | 15 #include <wtf/OwnPtr.h> |
| 16 | 16 |
| 17 using cc::CCActiveAnimation; | 17 using cc::CCActiveAnimation; |
| 18 | 18 |
| 19 namespace WebKit { | 19 namespace WebKit { |
| 20 | 20 |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 } | 104 } |
| 105 | 105 |
| 106 scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation() | 106 scoped_ptr<cc::CCActiveAnimation> WebAnimationImpl::cloneToCCAnimation() |
| 107 { | 107 { |
| 108 scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAn
imation::NonControllingInstance)); | 108 scoped_ptr<cc::CCActiveAnimation> toReturn(m_animation->clone(cc::CCActiveAn
imation::NonControllingInstance)); |
| 109 toReturn->setNeedsSynchronizedStartTime(true); | 109 toReturn->setNeedsSynchronizedStartTime(true); |
| 110 return toReturn.Pass(); | 110 return toReturn.Pass(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 } // namespace WebKit | 113 } // namespace WebKit |
| OLD | NEW |