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

Unified Diff: ui/aura/window_tree_host.cc

Issue 119753007: Add GrabWindowSnapshotAsync tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Test both sync and async paths Created 6 years, 12 months 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/window_tree_host.cc
diff --git a/ui/aura/window_tree_host.cc b/ui/aura/window_tree_host.cc
index 2702f2ff1fd579745273953f08aaddaa8ebeda6c..cbc264cadc013fd041fdb07d84fb2b78980ed15b 100644
--- a/ui/aura/window_tree_host.cc
+++ b/ui/aura/window_tree_host.cc
@@ -73,12 +73,7 @@ class SimpleRootWindowTransformer : public RootWindowTransformer {
// RootWindowHost, public:
RootWindowHost::~RootWindowHost() {
- // TODO(beng): this represents an ordering change. In the old code, the
- // compositor was reset before the window hierarchy was destroyed.
- // verify that this has no adverse effects.
enne (OOO) 2014/01/03 23:22:40 Unfortunately, this does have adverse effects if I
- // Make sure to destroy the compositor before terminating so that state is
- // cleared and we don't hit asserts.
- compositor_.reset();
+ DCHECK(!compositor_) << "compositor must be destroyed before root window";
}
void RootWindowHost::InitHost() {

Powered by Google App Engine
This is Rietveld 408576698