Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 2240a10c71b40ceac159bdb4ac32d8d6603b43c8..66dce7c6df7d10947c88b84f1d4b1a57887d612d 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -210,11 +210,10 @@ void ThreadProxy::RequestNewOutputSurface() { |
layer_tree_host()->RequestNewOutputSurface(); |
} |
-void ThreadProxy::SetOutputSurface(scoped_ptr<OutputSurface> output_surface) { |
+void ThreadProxy::SetOutputSurface(OutputSurface* output_surface) { |
Proxy::ImplThreadTaskRunner()->PostTask( |
- FROM_HERE, |
- base::Bind(&ThreadProxy::InitializeOutputSurfaceOnImplThread, |
- impl_thread_weak_ptr_, base::Passed(&output_surface))); |
+ FROM_HERE, base::Bind(&ThreadProxy::InitializeOutputSurfaceOnImplThread, |
+ impl_thread_weak_ptr_, output_surface)); |
} |
void ThreadProxy::DidInitializeOutputSurface( |
@@ -1058,12 +1057,12 @@ void ThreadProxy::InitializeImplOnImplThread(CompletionEvent* completion) { |
} |
void ThreadProxy::InitializeOutputSurfaceOnImplThread( |
- scoped_ptr<OutputSurface> output_surface) { |
+ OutputSurface* output_surface) { |
TRACE_EVENT0("cc", "ThreadProxy::InitializeOutputSurfaceOnImplThread"); |
DCHECK(IsImplThread()); |
LayerTreeHostImpl* host_impl = impl().layer_tree_host_impl.get(); |
- bool success = host_impl->InitializeRenderer(output_surface.Pass()); |
+ bool success = host_impl->InitializeRenderer(output_surface); |
RendererCapabilities capabilities; |
if (success) { |
capabilities = |