Chromium Code Reviews| Index: ui/compositor/layer_animator_collection.cc |
| diff --git a/ui/compositor/layer_animator_collection.cc b/ui/compositor/layer_animator_collection.cc |
| index 42dee6c259dd31f0ceb8d03df46bd7ad4daa7de4..ed85fbf823ed0e2681ba7e8ff49fcb7407549af0 100644 |
| --- a/ui/compositor/layer_animator_collection.cc |
| +++ b/ui/compositor/layer_animator_collection.cc |
| @@ -17,7 +17,7 @@ LayerAnimatorCollection::LayerAnimatorCollection(Compositor* compositor) |
| } |
| LayerAnimatorCollection::~LayerAnimatorCollection() { |
| - if (compositor_ && compositor_->HasAnimationObserver(this)) |
| + if (compositor_) |
| compositor_->RemoveAnimationObserver(this); |
| } |
| @@ -57,4 +57,12 @@ void LayerAnimatorCollection::OnAnimationStep(base::TimeTicks now) { |
| compositor_->RemoveAnimationObserver(this); |
| } |
| +void LayerAnimatorCollection::OnCompositingShuttingDown( |
| + Compositor* compositor) { |
| + if (compositor_) { |
|
danakj
2015/06/02 18:24:15
how can compositor_ be null here?
|
| + compositor_->RemoveAnimationObserver(this); |
| + } |
| + compositor_ = nullptr; |
| +} |
| + |
| } // namespace ui |