Chromium Code Reviews| Index: cc/trees/thread_proxy.cc |
| diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
| index 3dbf0d6297701b03e054f467542c09dc7ae7e37e..41ce672ab07c077a657d5840fc50f8c2f01bf814 100644 |
| --- a/cc/trees/thread_proxy.cc |
| +++ b/cc/trees/thread_proxy.cc |
| @@ -219,13 +219,12 @@ void ThreadProxy::DidLoseOutputSurface() { |
| } |
| } |
| -void ThreadProxy::CreateAndInitializeOutputSurface() { |
| - TRACE_EVENT0("cc", "ThreadProxy::DoCreateAndInitializeOutputSurface"); |
| +void ThreadProxy::RequestNewOutputSurface() { |
| DCHECK(IsMainThread()); |
| + layer_tree_host()->RequestNewOutputSurface(); |
| +} |
| - scoped_ptr<OutputSurface> output_surface = |
| - layer_tree_host()->CreateOutputSurface(); |
| - |
| +void ThreadProxy::SetOutputSurface(scoped_ptr<OutputSurface> output_surface) { |
| if (output_surface) { |
|
danakj
2014/06/20 23:36:34
Do we want the embedder to be able to call back wi
|
| Proxy::ImplThreadTaskRunner()->PostTask( |
| FROM_HERE, |
| @@ -249,7 +248,7 @@ void ThreadProxy::DidInitializeOutputSurface( |
| if (!success) { |
| Proxy::MainThreadTaskRunner()->PostTask( |
| FROM_HERE, |
| - base::Bind(&ThreadProxy::CreateAndInitializeOutputSurface, |
| + base::Bind(&ThreadProxy::RequestNewOutputSurface, |
| main_thread_weak_ptr_)); |
| } |
| } |
| @@ -1026,8 +1025,7 @@ void ThreadProxy::ScheduledActionBeginOutputSurfaceCreation() { |
| DCHECK(IsImplThread()); |
| Proxy::MainThreadTaskRunner()->PostTask( |
| FROM_HERE, |
| - base::Bind(&ThreadProxy::CreateAndInitializeOutputSurface, |
| - main_thread_weak_ptr_)); |
| + base::Bind(&ThreadProxy::RequestNewOutputSurface, main_thread_weak_ptr_)); |
| } |
| DrawResult ThreadProxy::DrawSwapInternal(bool forced_draw) { |