Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/html_frame.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_frame.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
@@ skipping 15 matching lines @@
 #include "components/html_viewer/stats_collection_controller.h"
 #include "components/html_viewer/touch_handler.h"
 #include "components/html_viewer/web_layer_impl.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/ids.h"
 #include "components/view_manager/public/cpp/scoped_view_ptr.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "components/view_manager/public/cpp/view_manager.h"
-#include "components/view_manager/public/interfaces/surfaces.mojom.h"
+#include "mandoline/services/navigation/public/interfaces/navigation.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/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
@@ skipping 534 matching lines @@
 
 void HTMLFrame::didCancelCompositionOnSelectionChange() {
   // TODO(penghuang): Update text input state.
 }
 
 void HTMLFrame::didChangeContents() {
   // TODO(penghuang): Update text input state.
 }
 
 void HTMLFrame::initializeLayerTreeView() {
-  mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:view_manager");
-  mojo::SurfacePtr surface;
-  GetLocalRootApp()->ConnectToService(request.Pass(), &surface);
+  DCHECK(view());
+
+  mojo::CompositorFrameReceiverPtr receiver;
+  view()->RequestCompositorFrameReceiver(mojo::GetProxy(&receiver));
 
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
   mojo::GpuPtr gpu_service;
   GetLocalRootApp()->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* HTMLFrame::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 void HTMLFrame::resetInputMethod() {
   // When this method gets called, WebWidgetClient implementation should
   // reset the input method by cancelling any ongoing composition.
   // TODO(penghuang): Reset IME.
@@ skipping 268 matching lines @@
 
 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
   NOTIMPLEMENTED();
 }
 
 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace mojo