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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/layer_tree_host_unittest_context.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/thread_proxy.h" 5 #include "cc/thread_proxy.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "cc/delay_based_time_source.h" 9 #include "cc/delay_based_time_source.h"
10 #include "cc/draw_quad.h" 10 #include "cc/draw_quad.h"
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 DebugScopedSetMainThreadBlocked mainThreadBlocked(this); 1006 DebugScopedSetMainThreadBlocked mainThreadBlocked(this);
1007 Proxy::implThread()->postTask(base::Bind(&ThreadProxy::commitPendingOnIm plThreadForTesting, m_implThreadWeakPtr, &commitPendingRequest)); 1007 Proxy::implThread()->postTask(base::Bind(&ThreadProxy::commitPendingOnIm plThreadForTesting, m_implThreadWeakPtr, &commitPendingRequest));
1008 commitPendingRequest.completion.wait(); 1008 commitPendingRequest.completion.wait();
1009 } 1009 }
1010 return commitPendingRequest.commitPending; 1010 return commitPendingRequest.commitPending;
1011 } 1011 }
1012 1012
1013 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ est) 1013 void ThreadProxy::commitPendingOnImplThreadForTesting(CommitPendingRequest* requ est)
1014 { 1014 {
1015 DCHECK(isImplThread()); 1015 DCHECK(isImplThread());
1016 request->commitPending = m_schedulerOnImplThread->commitPending(); 1016 if (m_layerTreeHostImpl->outputSurface())
1017 request->commitPending = m_schedulerOnImplThread->commitPending();
1018 else
1019 request->commitPending = false;
1017 request->completion.signal(); 1020 request->completion.signal();
1018 } 1021 }
1019 1022
1020 } // namespace cc 1023 } // namespace cc
OLDNEW
« 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