summaryrefslogtreecommitdiffstats
path: root/chromium/ui/gfx/animation/tween.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/ui/gfx/animation/tween.h')
-rw-r--r--chromium/ui/gfx/animation/tween.h25
1 files changed, 16 insertions, 9 deletions
diff --git a/chromium/ui/gfx/animation/tween.h b/chromium/ui/gfx/animation/tween.h
index 04f353db1ae..8b079ac73cb 100644
--- a/chromium/ui/gfx/animation/tween.h
+++ b/chromium/ui/gfx/animation/tween.h
@@ -16,15 +16,22 @@ namespace gfx {
class GFX_EXPORT Tween {
public:
enum Type {
- LINEAR, // Linear.
- EASE_OUT, // Fast in, slow out (default).
- EASE_IN, // Slow in, fast out.
- EASE_IN_2, // Variant of EASE_IN that starts out slower.
- EASE_IN_OUT, // Slow in and out, fast in the middle.
- FAST_IN_OUT, // Fast in and out, slow in the middle.
- EASE_OUT_SNAP, // Fast in, slow out, snap to final value.
- SMOOTH_IN_OUT, // Smooth, consistent speeds in and out (sine wave).
- ZERO, // Returns a value of 0 always.
+ LINEAR, // Linear.
+ EASE_OUT, // Fast in, slow out (default).
+ EASE_IN, // Slow in, fast out.
+ EASE_IN_2, // Variant of EASE_IN that starts out slower than
+ // EASE_IN.
+ EASE_IN_OUT, // Slow in and out, fast in the middle.
+ FAST_IN_OUT, // Fast in and out, slow in the middle.
+ EASE_OUT_SNAP, // Fast in, slow out, snap to final value.
+ SMOOTH_IN_OUT, // Smooth, consistent speeds in and out (sine wave).
+ FAST_OUT_SLOW_IN, // Variant of EASE_IN_OUT which should be used in most
+ // cases.
+ LINEAR_OUT_SLOW_IN, // Variant of EASE_OUT which should be used for
+ // fading in from 0% or motion when entering a scene.
+ FAST_OUT_LINEAR_IN, // Variant of EASE_IN which should should be used for
+ // fading out to 0% or motion when exiting a scene.
+ ZERO, // Returns a value of 0 always.
};
// Returns the value based on the tween type. |state| is from 0-1.