| 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 #ifndef WebAnimationImpl_h | 5 #ifndef WebAnimationImpl_h |
| 6 #define WebAnimationImpl_h | 6 #define WebAnimationImpl_h |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include <public/WebAnimation.h> | 9 #include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" |
| 10 #include <wtf/OwnPtr.h> | |
| 11 #include <wtf/PassOwnPtr.h> | |
| 12 | 10 |
| 13 namespace cc { | 11 namespace cc { |
| 14 class CCActiveAnimation; | 12 class CCActiveAnimation; |
| 15 } | 13 } |
| 16 | 14 |
| 17 namespace WebKit { | 15 namespace WebKit { |
| 18 | 16 |
| 19 class WebAnimationImpl : public WebAnimation { | 17 class WebAnimationImpl : public WebAnimation { |
| 20 public: | 18 public: |
| 21 WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId,
int groupId = 0); | 19 WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId,
int groupId = 0); |
| (...skipping 13 matching lines...) Expand all Loading... |
| 35 | 33 |
| 36 scoped_ptr<cc::CCActiveAnimation> cloneToCCAnimation(); | 34 scoped_ptr<cc::CCActiveAnimation> cloneToCCAnimation(); |
| 37 | 35 |
| 38 private: | 36 private: |
| 39 scoped_ptr<cc::CCActiveAnimation> m_animation; | 37 scoped_ptr<cc::CCActiveAnimation> m_animation; |
| 40 }; | 38 }; |
| 41 | 39 |
| 42 } | 40 } |
| 43 | 41 |
| 44 #endif // WebAnimationImpl_h | 42 #endif // WebAnimationImpl_h |
| OLD | NEW |