Mandoline: Allow submitting CompositorFrames directly to mojo::Views

mojo/cc/output_surface_mojo.h

Index: mojo/cc/output_surface_mojo.h
diff --git a/mojo/cc/output_surface_mojo.h b/mojo/cc/output_surface_mojo.h
index e8f8737d6d070764e6269a9d1d60c16f12c6c989..4dbc7f93ac794840829a7c40d81eb85f4f1f3a57 100644
--- a/mojo/cc/output_surface_mojo.h
+++ b/mojo/cc/output_surface_mojo.h
@@ -9,6 +9,7 @@
 #include "cc/output/output_surface.h"
 #include "cc/surfaces/surface_id.h"
 #include "components/view_manager/public/interfaces/surfaces.mojom.h"
+#include "components/view_manager/public/interfaces/view_manager.mojom.h"
 
 namespace mojo {
 
@@ -23,7 +24,7 @@ class OutputSurfaceMojo : public cc::OutputSurface {
  public:
   OutputSurfaceMojo(OutputSurfaceMojoClient* client,
                     const scoped_refptr<cc::ContextProvider>& context_provider,
-                    ScopedMessagePipeHandle surface_handle);
+                    ScopedMessagePipeHandle compositor_frame_receiver_handle);
 
   // cc::OutputSurface implementation.
   void SwapBuffers(cc::CompositorFrame* frame) override;
@@ -36,8 +37,8 @@ class OutputSurfaceMojo : public cc::OutputSurface {
   void SetIdNamespace(uint32_t id_namespace);
 
   OutputSurfaceMojoClient* output_surface_mojo_client_;
-  ScopedMessagePipeHandle surface_handle_;
-  SurfacePtr surface_;
+  ScopedMessagePipeHandle compositor_frame_receiver_handle_;
+  mojo::CompositorFrameReceiverPtr receiver_;
   uint32_t id_namespace_;
   uint32_t local_id_;
   gfx::Size surface_size_;