| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ | 5 #ifndef CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ |
| 6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ | 6 #define CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| 10 #include "cc/animation/animation_curve.h" | 11 #include "cc/animation/animation_curve.h" |
| 11 #include "cc/base/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 12 #include "ui/gfx/geometry/scroll_offset.h" | 13 #include "ui/gfx/geometry/scroll_offset.h" |
| 13 | 14 |
| 14 namespace cc { | 15 namespace cc { |
| 15 | 16 |
| 16 class TimingFunction; | 17 class TimingFunction; |
| 17 | 18 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 DurationBehavior duration_behavior_; | 53 DurationBehavior duration_behavior_; |
| 53 | 54 |
| 54 bool has_set_initial_value_; | 55 bool has_set_initial_value_; |
| 55 | 56 |
| 56 DISALLOW_COPY_AND_ASSIGN(ScrollOffsetAnimationCurve); | 57 DISALLOW_COPY_AND_ASSIGN(ScrollOffsetAnimationCurve); |
| 57 }; | 58 }; |
| 58 | 59 |
| 59 } // namespace cc | 60 } // namespace cc |
| 60 | 61 |
| 61 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_H_ | 62 #endif // CC_ANIMATION_SCROLL_OFFSET_ANIMATION_CURVE_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