Chromium Code Reviews| Index: components/html_viewer/web_layer_tree_view_impl.cc |
| diff --git a/components/html_viewer/web_layer_tree_view_impl.cc b/components/html_viewer/web_layer_tree_view_impl.cc |
| index 9d54f7e8a69097ee655637897219c9acfa22195b..e843ec6c0dc2ad545ed50a8ccb3a2f93b50c5567 100644 |
| --- a/components/html_viewer/web_layer_tree_view_impl.cc |
| +++ b/components/html_viewer/web_layer_tree_view_impl.cc |
| @@ -23,7 +23,7 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
| scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner, |
| gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager, |
| cc::TaskGraphRunner* task_graph_runner, |
| - mojo::SurfacePtr surface, |
| + mojo::CompositorFrameReceiverPtr receiver, |
| mojo::GpuPtr gpu_service) |
| : widget_(NULL), |
| view_(NULL), |
| @@ -61,14 +61,14 @@ WebLayerTreeViewImpl::WebLayerTreeViewImpl( |
| cc::LayerTreeHost::CreateThreaded(compositor_task_runner, ¶ms); |
| DCHECK(layer_tree_host_); |
| - if (surface && gpu_service) { |
| + if (receiver && gpu_service) { |
| mojo::CommandBufferPtr cb; |
| gpu_service->CreateOffscreenGLES2Context(GetProxy(&cb)); |
| scoped_refptr<cc::ContextProvider> context_provider( |
| new mojo::ContextProviderMojo(cb.PassInterface().PassHandle())); |
| output_surface_.reset( |
| new mojo::OutputSurfaceMojo(this, context_provider, |
| - surface.PassInterface().PassHandle())); |
| + receiver.PassInterface().PassHandle())); |
|
rjkroege
2015/08/19 23:45:44
impl gets it here obviously. but you have an order
Fady Samuel
2015/08/20 16:22:44
As per offline discussion, I think there was some
rjkroege
2015/08/21 18:54:45
yes. this code is running on main and CC will get
Fady Samuel
2015/08/21 21:31:10
Acknowledged.
|
| } |
| layer_tree_host_->SetLayerTreeHostClientReady(); |
| } |