Mandoline: Allow submitting CompositorFrames directly to mojo::Views

components/html_viewer/web_layer_tree_view_impl.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_HTML_VIEWER_WEB_LAYER_TREE_VIEW_IMPL_H_
 #define COMPONENTS_HTML_VIEWER_WEB_LAYER_TREE_VIEW_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace blink {
 class WebWidget;
 }
 
 namespace cc {
 class LayerTreeHost;
 class TaskGraphRunner;
 }
 
 namespace gpu {
 class GpuMemoryBufferManager;
 }
 
 namespace mojo {
 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;
 
   void set_widget(blink::WebWidget* widget) { widget_ = widget; }
   void set_view(mojo::View* view) { view_ = view; }
 
   // cc::LayerTreeHostClient implementation.
   void WillBeginMainFrame() override;
   void DidBeginMainFrame() override;
   void BeginMainFrame(const cc::BeginFrameArgs& args) override;
@@ skipping 50 matching lines @@
       const blink::WebLayer* outerViewportScrollLayer);
   virtual void clearViewportLayers();
   virtual void registerSelection(const blink::WebSelection& selection) {}
   virtual void clearSelection() {}
   virtual void setShowFPSCounter(bool) {}
   virtual void setShowPaintRects(bool) {}
   virtual void setShowDebugBorders(bool) {}
   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_;
   scoped_ptr<cc::LayerTreeHost> layer_tree_host_;
   scoped_ptr<cc::OutputSurface> output_surface_;
   scoped_refptr<base::SingleThreadTaskRunner>
       main_thread_compositor_task_runner_;
   base::WeakPtr<WebLayerTreeViewImpl> main_thread_bound_weak_ptr_;
 
   base::WeakPtrFactory<WebLayerTreeViewImpl> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(WebLayerTreeViewImpl);
 };
 
 }  // namespace html_viewer
 
 #endif  // COMPONENTS_HTML_VIEWER_WEB_LAYER_TREE_VIEW_IMPL_H_