| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 UI_GFX_ANIMATION_TWEEN_H_ | 5 #ifndef UI_GFX_ANIMATION_TWEEN_H_ |
| 6 #define UI_GFX_ANIMATION_TWEEN_H_ | 6 #define UI_GFX_ANIMATION_TWEEN_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "third_party/skia/include/core/SkColor.h" | 9 #include "third_party/skia/include/core/SkColor.h" |
| 10 #include "ui/gfx/animation/animation_export.h" | 10 #include "ui/gfx/animation/animation_export.h" |
| 11 #include "ui/gfx/geometry/rect.h" | 11 #include "ui/gfx/geometry/rect.h" |
| 12 #include "ui/gfx/geometry/size_f.h" |
| 12 #include "ui/gfx/transform.h" | 13 #include "ui/gfx/transform.h" |
| 13 | 14 |
| 14 namespace base { | 15 namespace base { |
| 15 class TimeTicks; | 16 class TimeTicks; |
| 16 } | 17 } |
| 17 | 18 |
| 18 namespace gfx { | 19 namespace gfx { |
| 19 | 20 |
| 20 class ANIMATION_EXPORT Tween { | 21 class ANIMATION_EXPORT Tween { |
| 21 public: | 22 public: |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 // specified by www.w3.org/TR/css3-transitions. | 66 // specified by www.w3.org/TR/css3-transitions. |
| 66 static int LinearIntValueBetween(double value, int start, int target); | 67 static int LinearIntValueBetween(double value, int start, int target); |
| 67 static gfx::Rect RectValueBetween(double value, | 68 static gfx::Rect RectValueBetween(double value, |
| 68 const gfx::Rect& start_bounds, | 69 const gfx::Rect& start_bounds, |
| 69 const gfx::Rect& target_bounds); | 70 const gfx::Rect& target_bounds); |
| 70 static gfx::Transform TransformValueBetween( | 71 static gfx::Transform TransformValueBetween( |
| 71 double value, | 72 double value, |
| 72 const gfx::Transform& start_transform, | 73 const gfx::Transform& start_transform, |
| 73 const gfx::Transform& target_transform); | 74 const gfx::Transform& target_transform); |
| 74 | 75 |
| 76 static gfx::SizeF SizeValueBetween(double value, |
| 77 const gfx::SizeF& start_size, |
| 78 const gfx::SizeF& target_size); |
| 79 |
| 75 private: | 80 private: |
| 76 Tween(); | 81 Tween(); |
| 77 ~Tween(); | 82 ~Tween(); |
| 78 | 83 |
| 79 DISALLOW_COPY_AND_ASSIGN(Tween); | 84 DISALLOW_COPY_AND_ASSIGN(Tween); |
| 80 }; | 85 }; |
| 81 | 86 |
| 82 } // namespace gfx | 87 } // namespace gfx |
| 83 | 88 |
| 84 #endif // UI_GFX_ANIMATION_TWEEN_H_ | 89 #endif // UI_GFX_ANIMATION_TWEEN_H_ |
| OLD | NEW |