| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ | 5 #ifndef CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| 6 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ | 6 #define CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "content/common/content_export.h" | 9 #include "cc/blink/cc_blink_export.h" |
| 10 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" | 10 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" |
| 11 #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h" | 11 #include "third_party/WebKit/public/platform/WebCompositorAnimationCurve.h" |
| 12 | 12 |
| 13 namespace cc { | 13 namespace cc { |
| 14 class Animation; | 14 class Animation; |
| 15 } | 15 } |
| 16 | 16 |
| 17 namespace content { | 17 namespace cc_blink { |
| 18 | 18 |
| 19 class WebCompositorAnimationImpl : public blink::WebCompositorAnimation { | 19 class WebCompositorAnimationImpl : public blink::WebCompositorAnimation { |
| 20 public: | 20 public: |
| 21 CONTENT_EXPORT WebCompositorAnimationImpl( | 21 CC_BLINK_EXPORT WebCompositorAnimationImpl( |
| 22 const blink::WebCompositorAnimationCurve& curve, | 22 const blink::WebCompositorAnimationCurve& curve, |
| 23 TargetProperty target, | 23 TargetProperty target, |
| 24 int animation_id, | 24 int animation_id, |
| 25 int group_id); | 25 int group_id); |
| 26 virtual ~WebCompositorAnimationImpl(); | 26 virtual ~WebCompositorAnimationImpl(); |
| 27 | 27 |
| 28 // blink::WebCompositorAnimation implementation | 28 // blink::WebCompositorAnimation implementation |
| 29 virtual int id(); | 29 virtual int id(); |
| 30 virtual TargetProperty targetProperty() const; | 30 virtual TargetProperty targetProperty() const; |
| 31 #if WEB_ANIMATION_SUPPORTS_FRACTIONAL_ITERATIONS | 31 #if WEB_ANIMATION_SUPPORTS_FRACTIONAL_ITERATIONS |
| (...skipping 16 matching lines...) Expand all Loading... |
| 48 #endif | 48 #endif |
| 49 | 49 |
| 50 scoped_ptr<cc::Animation> PassAnimation(); | 50 scoped_ptr<cc::Animation> PassAnimation(); |
| 51 | 51 |
| 52 private: | 52 private: |
| 53 scoped_ptr<cc::Animation> animation_; | 53 scoped_ptr<cc::Animation> animation_; |
| 54 | 54 |
| 55 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl); | 55 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl); |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 } // namespace content | 58 } // namespace cc_blink |
| 59 | 59 |
| 60 #endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ | 60 #endif // CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| 61 | |
| OLD | NEW |