diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-20 15:31:19 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-20 15:31:19 +0000 |
| commit | 0d316250465743d53a9b886b44497c768e0d0c4c (patch) | |
| tree | 570837e676177ef471aac8b62dc759deefd00b43 /ui/compositor/scoped_layer_animation_settings.h | |
| parent | 6d4b66c1480ea3c09a50e25377a89fbc1e7d5db0 (diff) | |
| download | chromium_src-0d316250465743d53a9b886b44497c768e0d0c4c.zip chromium_src-0d316250465743d53a9b886b44497c768e0d0c4c.tar.gz chromium_src-0d316250465743d53a9b886b44497c768e0d0c4c.tar.bz2 | |
Revert https://codereview.chromium.org/105673008/ because the CL was causing a crash (http://crbug.com/335068)
BUG=335068
TEST=Crash stops occuring
TBR=pkotwicz
Review URL: https://codereview.chromium.org/130413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245913 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/compositor/scoped_layer_animation_settings.h')
| -rw-r--r-- | ui/compositor/scoped_layer_animation_settings.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/compositor/scoped_layer_animation_settings.h b/ui/compositor/scoped_layer_animation_settings.h index e36b853..e8a1b46 100644 --- a/ui/compositor/scoped_layer_animation_settings.h +++ b/ui/compositor/scoped_layer_animation_settings.h @@ -34,6 +34,12 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings { void SetTransitionDuration(base::TimeDelta duration); base::TimeDelta GetTransitionDuration() const; + // Locks transition duration in |animator_|. When transition duration + // is locked any subsequent changes to it are ignored until the + // ScopedLayerAnimationSettings object that has locked the duration goes out + // of scope. + void LockTransitionDuration(); + void SetTweenType(gfx::Tween::Type tween_type); gfx::Tween::Type GetTweenType() const; @@ -50,6 +56,7 @@ class COMPOSITOR_EXPORT ScopedLayerAnimationSettings { private: LayerAnimator* animator_; + bool old_is_transition_duration_locked_; base::TimeDelta old_transition_duration_; gfx::Tween::Type old_tween_type_; LayerAnimator::PreemptionStrategy old_preemption_strategy_; |