Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/web_layer_tree_view_impl.h

Index: components/html_viewer/web_layer_tree_view_impl.h
diff --git a/components/html_viewer/web_layer_tree_view_impl.h b/components/html_viewer/web_layer_tree_view_impl.h
index 80191e6ef465c598fb4c19052b167bd5e50a4919..b525d4ebf914a0ce47ac1d1846a109c29aeda353 100644
--- a/components/html_viewer/web_layer_tree_view_impl.h
+++ b/components/html_viewer/web_layer_tree_view_impl.h
@@ -12,7 +12,7 @@
 #include "base/single_thread_task_runner.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "components/view_manager/public/interfaces/gpu.mojom.h"
-#include "components/view_manager/public/interfaces/surfaces.mojom.h"
+#include "components/view_manager/public/interfaces/view_manager.mojom.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "third_party/WebKit/public/platform/WebLayerTreeView.h"
 
@@ -40,14 +40,13 @@ class View;
 namespace html_viewer {
 
 class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
-                             public cc::LayerTreeHostClient,
-                             public mojo::OutputSurfaceMojoClient {
+                             public cc::LayerTreeHostClient {
  public:
   WebLayerTreeViewImpl(
       scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       cc::TaskGraphRunner* task_graph_runner,
-      mojo::SurfacePtr surface,
+      mojo::CompositorFrameReceiverPtr receiver,
       mojo::GpuPtr gpu_service);
   ~WebLayerTreeViewImpl() override;
 
@@ -118,12 +117,7 @@ class WebLayerTreeViewImpl : public blink::WebLayerTreeView,
   virtual void setContinuousPaintingEnabled(bool) {}
   virtual void setShowScrollBottleneckRects(bool) {}
 
-  // OutputSurfaceMojoClient implementation.
-  void DidCreateSurface(cc::SurfaceId id) override;
-
  private:
-  void DidCreateSurfaceOnMainThread(cc::SurfaceId id);
-
   // widget_ and view_ will outlive us.
   blink::WebWidget* widget_;
   mojo::View* view_;