ui/aura/desktop.cc - Issue 8800030: Fix assert with webkit compositor. The assert was hitting because we

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/desktop.cc

Issue 8800030: Fix assert with webkit compositor. The assert was hitting because we (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Spacing and comment 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:

Index: ui/aura/desktop.cc

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

index 38818e69f46b9ae7776eb9f29d2b8a256da85d82..7bf25d3abb037af965a710fe6d7e5fd8bb6fac0c 100644

--- a/ui/aura/desktop.cc

+++ b/ui/aura/desktop.cc

@@ -429,6 +429,9 @@ Desktop::Desktop()

Desktop::~Desktop() {

in_destructor_ = true;

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

+ // cleared and we don't hit asserts.

+ compositor_ = NULL;

#ifdef USE_WEBKIT_COMPOSITOR

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

ui::CompositorCC::Terminate();

« no previous file with comments | « no previous file | no next file » | no next file with comments »