Index: ui/compositor/layer_animation_observer.cc |
=================================================================== |
--- ui/compositor/layer_animation_observer.cc (revision 153309) |
+++ ui/compositor/layer_animation_observer.cc (working copy) |
@@ -56,14 +56,10 @@ |
// ImplicitAnimationObserver |
ImplicitAnimationObserver::ImplicitAnimationObserver() |
- : active_(false), |
- destroyed_(NULL) { |
+ : active_(false) { |
} |
-ImplicitAnimationObserver::~ImplicitAnimationObserver() { |
- if (destroyed_) |
- *destroyed_ = true; |
-} |
+ImplicitAnimationObserver::~ImplicitAnimationObserver() {} |
void ImplicitAnimationObserver::SetActive(bool active) { |
active_ = active; |
@@ -77,12 +73,7 @@ |
void ImplicitAnimationObserver::OnLayerAnimationEnded( |
LayerAnimationSequence* sequence) { |
- bool destroyed = false; |
- destroyed_ = &destroyed; |
sequence->RemoveObserver(this); |
- if (destroyed) |
- return; |
- destroyed_ = NULL; |
DCHECK(attached_sequences().find(sequence) == attached_sequences().end()); |
CheckCompleted(); |
} |