Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(651)

Unified Diff: ui/compositor/layer_animation_observer.cc

Issue 10869066: Attempt 2 at Fixes crash introduced @ 153047 (you can hit crash by maximizing a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Better fix Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/compositor/layer_animation_observer.cc
diff --git a/ui/compositor/layer_animation_observer.cc b/ui/compositor/layer_animation_observer.cc
index b41676aef27376915e93978f5dc11660eb015ecf..a70eb582ebecdd04f268adde9fa4db17feb77e42 100644
--- a/ui/compositor/layer_animation_observer.cc
+++ b/ui/compositor/layer_animation_observer.cc
@@ -56,10 +56,14 @@ void LayerAnimationObserver::DetachedFromSequence(
// ImplicitAnimationObserver
ImplicitAnimationObserver::ImplicitAnimationObserver()
- : active_(false) {
+ : active_(false),
+ destroyed_(NULL) {
}
-ImplicitAnimationObserver::~ImplicitAnimationObserver() {}
+ImplicitAnimationObserver::~ImplicitAnimationObserver() {
+ if (destroyed_)
+ *destroyed_ = true;
+}
void ImplicitAnimationObserver::SetActive(bool active) {
active_ = active;
@@ -73,7 +77,12 @@ void ImplicitAnimationObserver::StopObservingImplicitAnimations() {
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();
}
@@ -101,8 +110,8 @@ void ImplicitAnimationObserver::OnDetachedFromSequence(
void ImplicitAnimationObserver::CheckCompleted() {
if (active_ && attached_sequences().empty()) {
- OnImplicitAnimationsCompleted();
active_ = false;
+ OnImplicitAnimationsCompleted();
}
}

Powered by Google App Engine
This is Rietveld 408576698