Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/html_document.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/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/html_viewer/blink_input_events_type_converters.h"
 #include "components/html_viewer/blink_url_request_type_converters.h"
 #include "components/html_viewer/devtools_agent_impl.h"
 #include "components/html_viewer/geolocation_client_impl.h"
 #include "components/html_viewer/global_state.h"
 #include "components/html_viewer/media_factory.h"
 #include "components/html_viewer/stats_collection_controller.h"
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
 #include "components/view_manager/public/cpp/view_property.h"
-#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "skia/ext/refptr.h"
 #include "third_party/WebKit/public/platform/Platform.h"
 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
@@ skipping 159 matching lines @@
   if (web_view_)
     web_view_->close();
   if (root_)
     root_->RemoveObserver(this);
 }
 
 void HTMLDocument::OnEmbed(View* root) {
   DCHECK(!global_state_->is_headless());
   root_ = root;
   root_->AddObserver(this);
+  root_->RequestCompositorFrameReceiver(
+      compositor_frame_receiver_request_.Pass());
   UpdateFocus();
 
   InitGlobalStateAndLoadIfNecessary();
 }
 
 void HTMLDocument::OnViewManagerDestroyed(ViewManager* view_manager) {
   delete this;
 }
 
 void HTMLDocument::Create(mojo::ApplicationConnection* connection,
@@ skipping 77 matching lines @@
 }
 
 void HTMLDocument::initializeLayerTreeView() {
   if (global_state_->is_headless()) {
     web_layer_tree_view_impl_.reset(
         new WebLayerTreeViewImpl(global_state_->compositor_thread(), nullptr,
                                  nullptr, nullptr, nullptr));
     return;
   }
 
-  mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:view_manager");
-  mojo::SurfacePtr surface;
-  html_document_app_->ConnectToService(request.Pass(), &surface);
+  mojo::CompositorFrameReceiverPtr receiver;
+  compositor_frame_receiver_request_ = GetProxy(&receiver);
 
   // TODO(jamesr): Should be mojo:gpu_service
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
   mojo::GpuPtr gpu_service;
   html_document_app_->ConnectToService(request2.Pass(), &gpu_service);
   web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
       global_state_->compositor_thread(),
       global_state_->gpu_memory_buffer_manager(),
       global_state_->raster_thread_helper()->task_graph_runner(),
-      surface.Pass(), gpu_service.Pass()));
+      receiver.Pass(), gpu_service.Pass()));
 }
 
 blink::WebLayerTreeView* HTMLDocument::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
@@ skipping 159 matching lines @@
 
 void HTMLDocument::UpdateFocus() {
   if (!web_view_)
     return;
   bool is_focused = root_ && root_->HasFocus();
   web_view_->setFocus(is_focused);
   web_view_->setIsActive(is_focused);
 }
 
 }  // namespace html_viewer