Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/html_frame.cc

Index: components/html_viewer/html_frame.cc
diff --git a/components/html_viewer/html_frame.cc b/components/html_viewer/html_frame.cc
index 0d6c94898aed4cb181dcf4c32aeeb2c8881e7872..af57273e3c404a0a9783ea9cf2ab55844363cd42 100644
--- a/components/html_viewer/html_frame.cc
+++ b/components/html_viewer/html_frame.cc
@@ -33,7 +33,6 @@
 #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"
@@ -599,10 +598,10 @@ void HTMLFrame::didChangeContents() {
 }
 
 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(GetProxy(&receiver));
 
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
@@ -612,7 +611,7 @@ void HTMLFrame::initializeLayerTreeView() {
       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() {