Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/html_widget.cc

 // Copyright 2015 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_widget.h"
 
 #include "components/html_viewer/blink_input_events_type_converters.h"
 #include "components/html_viewer/blink_text_input_type_converters.h"
 #include "components/html_viewer/global_state.h"
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/view_manager/public/cpp/view.h"
-#include "components/view_manager/public/interfaces/surfaces.mojom.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "third_party/WebKit/public/web/WebFrameWidget.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace html_viewer {
 namespace {
 
 scoped_ptr<WebLayerTreeViewImpl> CreateWebLayerTreeView(
-    mojo::ApplicationImpl* app,
     GlobalState* global_state) {
-  mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:view_manager");
-  mojo::SurfacePtr surface;
-  app->ConnectToService(request.Pass(), &surface);
-
-  mojo::URLRequestPtr request2(mojo::URLRequest::New());
-  request2->url = mojo::String::From("mojo:view_manager");
-  mojo::GpuPtr gpu_service;
-  app->ConnectToService(request2.Pass(), &gpu_service);
   return make_scoped_ptr(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()));
+      global_state->raster_thread_helper()->task_graph_runner()));
 }
 
 void UpdateWebViewSizeFromViewSize(mojo::View* view,
                                    blink::WebWidget* web_widget,
                                    WebLayerTreeViewImpl* web_layer_tree_view) {
   const gfx::Size size_in_pixels(view->bounds().width, view->bounds().height);
   const gfx::Size size_in_dips = gfx::ConvertSizeToDIP(
       view->viewport_metrics().device_pixel_ratio, size_in_pixels);
   web_widget->resize(
       blink::WebSize(size_in_dips.width(), size_in_dips.height()));
@@ skipping 36 matching lines @@
 
 HTMLWidgetRootLocal::HTMLWidgetRootLocal(CreateParams* create_params)
     : app_(create_params->app),
       global_state_(create_params->global_state),
       view_(create_params->view),
       web_view_(nullptr) {
   web_view_ = blink::WebView::create(this);
   // Creating the widget calls initializeLayerTreeView() to create the
   // |web_layer_tree_view_impl_|. As we haven't yet assigned the |web_view_|
   // we have to set it here.
+  DCHECK(view_);
+  mojo::URLRequestPtr request(mojo::URLRequest::New());
+  request->url = mojo::String::From("mojo:view_manager");
+  mojo::GpuPtr gpu_service;
+  app_->ConnectToService(request.Pass(), &gpu_service);
+
   if (web_layer_tree_view_impl_) {
-    web_layer_tree_view_impl_->set_widget(web_view_);
-    web_layer_tree_view_impl_->set_view(create_params->view);
+    web_layer_tree_view_impl_->Initialize(gpu_service.Pass(),
+                                          view_,
+                                          web_view_);
     UpdateWebViewSizeFromViewSize(view_, web_view_,
                                   web_layer_tree_view_impl_.get());
   }
   ConfigureSettings(web_view_->settings());
 }
 
 HTMLWidgetRootLocal::~HTMLWidgetRootLocal() {}
 
 blink::WebStorageNamespace*
 HTMLWidgetRootLocal::createSessionStorageNamespace() {
   return new WebStorageNamespaceImpl();
 }
 
 void HTMLWidgetRootLocal::didCancelCompositionOnSelectionChange() {
   // TODO(penghuang): Update text input state.
 }
 
 void HTMLWidgetRootLocal::didChangeContents() {
   // TODO(penghuang): Update text input state.
 }
 
 void HTMLWidgetRootLocal::initializeLayerTreeView() {
-  web_layer_tree_view_impl_ = CreateWebLayerTreeView(app_, global_state_);
+  web_layer_tree_view_impl_ = CreateWebLayerTreeView(global_state_);
 }
 
 blink::WebLayerTreeView* HTMLWidgetRootLocal::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 void HTMLWidgetRootLocal::resetInputMethod() {
   // When this method gets called, WebWidgetClient implementation should
   // reset the input method by cancelling any ongoing composition.
   // TODO(penghuang): Reset IME.
@@ skipping 65 matching lines @@
                                          GlobalState* global_state,
                                          mojo::View* view,
                                          blink::WebLocalFrame* web_local_frame)
     : app_(app), global_state_(global_state), web_frame_widget_(nullptr) {
   web_frame_widget_ = blink::WebFrameWidget::create(this, web_local_frame);
   // Creating the widget calls initializeLayerTreeView() to create the
   // |web_layer_tree_view_impl_|. As we haven't yet assigned the
   // |web_frame_widget_|
   // we have to set it here.
   if (web_layer_tree_view_impl_) {
-    web_layer_tree_view_impl_->set_widget(web_frame_widget_);
-    web_layer_tree_view_impl_->set_view(view);
+    DCHECK(view);

[sky, 2015/08/26 22:58:03]

Isn't this and 85-94 about the same? It seems like the two could be shared.

[Fady Samuel, 2015/08/26 23:51:00]

Done.

+    mojo::URLRequestPtr request(mojo::URLRequest::New());
+    request->url = mojo::String::From("mojo:view_manager");
+    mojo::GpuPtr gpu_service;
+    app_->ConnectToService(request.Pass(), &gpu_service);
+    web_layer_tree_view_impl_->Initialize(gpu_service.Pass(),
+                                          view,
+                                          web_frame_widget_);
     UpdateWebViewSizeFromViewSize(view, web_frame_widget_,
                                   web_layer_tree_view_impl_.get());
   }
 }
 
 HTMLWidgetLocalRoot::~HTMLWidgetLocalRoot() {}
 
 blink::WebWidget* HTMLWidgetLocalRoot::GetWidget() {
   return web_frame_widget_;
 }
 
 void HTMLWidgetLocalRoot::OnViewBoundsChanged(mojo::View* view) {
   UpdateWebViewSizeFromViewSize(view, web_frame_widget_,
                                 web_layer_tree_view_impl_.get());
 }
 
 void HTMLWidgetLocalRoot::initializeLayerTreeView() {
-  web_layer_tree_view_impl_ = CreateWebLayerTreeView(app_, global_state_);
+  web_layer_tree_view_impl_ = CreateWebLayerTreeView(global_state_);
 }
 
 blink::WebLayerTreeView* HTMLWidgetLocalRoot::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 }  // namespace html_viewer