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

Unified Diff: ui/aura/window_tree_host.cc

Issue 2565583002: Revert of Ensure compositor initialized before WindowTreeHost is Shown. (Closed)
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/mus/window_tree_client_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_tree_host.cc
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index a1bac9be53163090c41ee54d31644ad12ae785ce..87fac84f1cfdfdd5241b829cdd23697b119055f6 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -209,11 +209,8 @@
}
void WindowTreeHost::Show() {
- // Ensure that compositor has been properly initialized, see InitCompositor()
- // and InitHost().
- DCHECK(compositor());
- DCHECK_EQ(compositor()->root_layer(), window()->layer());
- compositor()->SetVisible(true);
+ if (compositor())
+ 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 »

Powered by Google App Engine
This is Rietveld 408576698