Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/web_layer_tree_view_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 
 #include "base/thread_task_runner_handle.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/trees/layer_tree_host.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "mojo/cc/context_provider_mojo.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 #include "ui/gfx/buffer_types.h"
 
 namespace html_viewer {
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(
     scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
-    cc::TaskGraphRunner* task_graph_runner,
-    mojo::SurfacePtr surface,
-    mojo::GpuPtr gpu_service)
+    cc::TaskGraphRunner* task_graph_runner)
     : widget_(NULL),
       view_(NULL),
       main_thread_compositor_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       weak_factory_(this) {
   main_thread_bound_weak_ptr_ = weak_factory_.GetWeakPtr();
 
   cc::LayerTreeSettings settings;
 
   // Must match the value of
   // blink::RuntimeEnabledFeature::slimmingPaintEnabled()
@@ skipping 16 matching lines @@
   params.client = this;
   params.shared_bitmap_manager = shared_bitmap_manager;
   params.gpu_memory_buffer_manager = gpu_memory_buffer_manager;
   params.settings = &settings;
   params.task_graph_runner = task_graph_runner;
   params.main_task_runner = main_thread_compositor_task_runner_;
 
   layer_tree_host_ =
       cc::LayerTreeHost::CreateThreaded(compositor_task_runner, &params);
   DCHECK(layer_tree_host_);
+}
 
-  if (surface && gpu_service) {
+void WebLayerTreeViewImpl::Initialize(mojo::GpuPtr gpu_service,
+                                      mojo::View* view,
+                                      blink::WebWidget* widget) {
+  view_ = view;
+  widget_ = widget;
+  if (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, view_->RequestSurface()));
   }
   layer_tree_host_->SetLayerTreeHostClientReady();
 }
 
 WebLayerTreeViewImpl::~WebLayerTreeViewImpl() {
   // Destroy the LayerTreeHost before anything else as doing so ensures we're
   // not accessed on the compositor thread (we are the LayerTreeHostClient).
   layer_tree_host_.reset();
 }
 
@@ skipping 156 matching lines @@
 }
 
 void WebLayerTreeViewImpl::setNeedsAnimate() {
   layer_tree_host_->SetNeedsAnimate();
 }
 
 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