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

Unified Diff: cc/thread_proxy.cc

Issue 11782026: ThreadedTest that a non-null OutputSurface that fails initialization immediately doesn't crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix hang Created 7 years, 11 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
« no previous file with comments | « cc/layer_tree_host_unittest_context.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/thread_proxy.cc
diff --git a/cc/thread_proxy.cc b/cc/thread_proxy.cc
index 68bb89078cebdc692867927743c202bb88f4076b..9f63c3b8a8a7a87fa83e1046e92bd9ed64e9eab0 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -1013,7 +1013,10 @@ bool ThreadProxy::commitPendingForTesting()
void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* request)
{
DCHECK(isImplThread());
- request->commitPending = m_schedulerOnImplThread->commitPending();
+ if (m_layerTreeHostImpl->outputSurface())
+ request->commitPending = m_schedulerOnImplThread->commitPending();
+ else
+ request->commitPending = false;
request->completion.signal();
}
« no previous file with comments | « cc/layer_tree_host_unittest_context.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698