Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/web_layer_tree_view_impl.cc

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..e45ab7eeea97e164a7d46c3fdfc079613d243764 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, &params);
   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()));
+        new mojo::OutputSurfaceMojo(context_provider,
+                                    receiver.PassInterface()));
   }
   layer_tree_host_->SetLayerTreeHostClientReady();
 }
@@ -243,16 +243,4 @@ void WebLayerTreeViewImpl::finishAllRendering() {
   layer_tree_host_->FinishAllRendering();
 }
 
-void WebLayerTreeViewImpl::DidCreateSurface(cc::SurfaceId id) {
-  main_thread_compositor_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
-                 main_thread_bound_weak_ptr_,
-                 id));
-}
-
-void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
-  view_->SetSurfaceId(mojo::SurfaceId::From(id));
-}
-
 }  // namespace html_viewer