| 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 CC_BLINK_WEB_ANIMATION_IMPL_H_ | 5 #ifndef CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| 6 #define CC_BLINK_WEB_ANIMATION_IMPL_H_ | 6 #define CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/blink/cc_blink_export.h" | 10 #include "cc/blink/cc_blink_export.h" |
| 10 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" | 11 #include "third_party/WebKit/public/platform/WebCompositorAnimation.h" |
| 11 | 12 |
| 12 namespace cc { | 13 namespace cc { |
| 13 class Animation; | 14 class Animation; |
| 14 } | 15 } |
| 15 | 16 |
| 16 namespace blink { | 17 namespace blink { |
| 17 class WebCompositorAnimationCurve; | 18 class WebCompositorAnimationCurve; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 51 |
| 51 private: | 52 private: |
| 52 scoped_ptr<cc::Animation> animation_; | 53 scoped_ptr<cc::Animation> animation_; |
| 53 | 54 |
| 54 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl); | 55 DISALLOW_COPY_AND_ASSIGN(WebCompositorAnimationImpl); |
| 55 }; | 56 }; |
| 56 | 57 |
| 57 } // namespace cc_blink | 58 } // namespace cc_blink |
| 58 | 59 |
| 59 #endif // CC_BLINK_WEB_ANIMATION_IMPL_H_ | 60 #endif // CC_BLINK_WEB_ANIMATION_IMPL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1539203002:
Switch to standard integer types in cc/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master