ui/aura/window_tree_host.cc - Issue 2552003002: Ensure compositor initialized before WindowTreeHost is Shown.

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

Issue 2552003002: Ensure compositor initialized before WindowTreeHost is Shown. (Closed)

Patch Set: Fixing WindowServerTest.EstablishConnectionViaFactory Created 4 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/window_tree_host.cc

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

index 87fac84f1cfdfdd5241b829cdd23697b119055f6..a1bac9be53163090c41ee54d31644ad12ae785ce 100644

--- a/ui/aura/window_tree_host.cc

+++ b/ui/aura/window_tree_host.cc

@@ -209,8 +209,11 @@ ui::EventDispatchDetails WindowTreeHost::DispatchKeyEventPostIME(

}

void WindowTreeHost::Show() {

- if (compositor())

- compositor()->SetVisible(true);

+ // Ensure that compositor has been properly initialized, see InitCompositor()

+ // and InitHost().

+ DCHECK(compositor());

+ DCHECK_EQ(compositor()->root_layer(), window()->layer());

+ compositor()->SetVisible(true);

ShowImpl();

}

« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | no next file » | no next file with comments »