ui/aura/root_window.cc - Issue 8816008: Remove aura::RootWindow instance from LayerAnimator::observers_ when the window is deleted

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/root_window.cc

Issue 8816008: Remove aura::RootWindow instance from LayerAnimator::observers_ when the window is deleted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years 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/aura/root_window.cc

diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc

index bf646fcf0b0d279513965db3f1347098ab8e5d13..9b9286d4ec06f64ae31adaf1c9b790fea06c1d95 100644

--- a/ui/aura/root_window.cc

+++ b/ui/aura/root_window.cc

@@ -434,6 +434,7 @@ RootWindow::~RootWindow() {

// Make sure to destroy the compositor before terminating so that state is

// cleared and we don't hit asserts.

compositor_ = NULL;

+ layer()->GetAnimator()->RemoveObserver(this);

Ben Goodger (Google) 2011/12/08 17:14:17 You should add a comment here that an observer may

Yusuke Sato 2011/12/09 01:50:59 Done.

#ifdef USE_WEBKIT_COMPOSITOR

if (!ui::Compositor::compositor_factory())

ui::CompositorCC::Terminate();

« no previous file with comments | « no previous file | ui/aura_shell/shell_accelerator_controller_unittest.cc » ('j') | no next file with comments »