diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:13:36 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-21 21:13:36 +0000 |
| commit | ea2f334013cc065471afc0875b334219cfc0b426 (patch) | |
| tree | c4e1247b3fa8a849e040fc774e20b349ea75da22 /ui/base/animation | |
| parent | 81a1608890b65727da4e57ecce997fafa0c2f2e0 (diff) | |
| download | chromium_src-ea2f334013cc065471afc0875b334219cfc0b426.zip chromium_src-ea2f334013cc065471afc0875b334219cfc0b426.tar.gz chromium_src-ea2f334013cc065471afc0875b334219cfc0b426.tar.bz2 | |
[cros] Go back to EASE_OUT for boot transition
BUG=141988
Review URL: https://chromiumcodereview.appspot.com/10960034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158079 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/animation')
| -rw-r--r-- | ui/base/animation/tween.cc | 3 | ||||
| -rw-r--r-- | ui/base/animation/tween.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ui/base/animation/tween.cc b/ui/base/animation/tween.cc index f3a854f..18a21b8 100644 --- a/ui/base/animation/tween.cc +++ b/ui/base/animation/tween.cc @@ -46,6 +46,9 @@ double Tween::CalculateValue(Tween::Type type, double state) { return 1.0 - pow(1.0 - state, 2); case EASE_OUT_2: + return 1.0 - pow(1.0 - state, 3); + + case EASE_OUT_3: return 1.0 - pow(1.0 - state, 4); case SMOOTH_IN_OUT: diff --git a/ui/base/animation/tween.h b/ui/base/animation/tween.h index b8b58c7..fc3984c 100644 --- a/ui/base/animation/tween.h +++ b/ui/base/animation/tween.h @@ -18,6 +18,7 @@ class UI_EXPORT Tween { LINEAR, // Linear. EASE_OUT, // Fast in, slow out (default). EASE_OUT_2, // Variant of EASE_OUT, that starts out slower. + EASE_OUT_3, // Variant of EASE_OUT_2, that starts out slower. 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. |