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

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: moar subclass 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 13339ab5cd4863f3bfd32e1db7f88385bb6b744a..275bb374fddd97d87af7f4c30a20e9ab1c4d2dcc 100644
--- a/cc/thread_proxy.cc
+++ b/cc/thread_proxy.cc
@@ -1012,7 +1012,8 @@ bool ThreadProxy::commitPendingForTesting()
void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* request)
{
DCHECK(isImplThread());
- request->commitPending = m_schedulerOnImplThread->commitPending();
+ if (m_layerTreeHostImpl->outputSurface())
+ request->commitPending = m_schedulerOnImplThread->commitPending();
danakj 2013/01/09 01:39:59 else commitPending = false; I suspect you're leav
jamesr 2013/01/09 19:35:41 D'oh! PTAL
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