blimp: Move BlimpCompositor to use delegated rendering.

blimp/client/feature/compositor/blimp_compositor.h

Index: blimp/client/feature/compositor/blimp_compositor.h
diff --git a/blimp/client/feature/compositor/blimp_compositor.h b/blimp/client/feature/compositor/blimp_compositor.h
index c9aeda8ee69c9abdc36f2c5ddb8834f5d033c638..0aedc88b0debbb7bc065925436609877525fd7c8 100644
--- a/blimp/client/feature/compositor/blimp_compositor.h
+++ b/blimp/client/feature/compositor/blimp_compositor.h
@@ -6,11 +6,12 @@
 #define BLIMP_CLIENT_FEATURE_COMPOSITOR_BLIMP_COMPOSITOR_H_
 
 #include <memory>
-#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
+#include "blimp/client/core/compositor/output_surface_proxy.h"
 #include "blimp/client/feature/compositor/blimp_input_manager.h"
+#include "cc/surfaces/surface_factory_client.h"
 #include "cc/trees/layer_tree_host.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "cc/trees/layer_tree_settings.h"
@@ -21,21 +22,27 @@
 namespace base {
 class SingleThreadTaskRunner;
 class Thread;
-}
+}  // namespace base
 
 namespace cc {
 namespace proto {
 class CompositorMessage;
 class InitializeImpl;
 }

[David Trainor- moved to gerrit, 2016/08/22 23:58:10]

I've heard for small forward declaration namespaces we don't have to/shouldn't
add the closing comment, but if you're doing it do we need one here as well?

[Khushal, 2016/08/23 02:53:11]

Its nice to do that. Done.

+class Layer;
 class LayerTreeHost;
-}
+class Surface;
+class SurfaceId;
+class SurfaceIdAllocator;
+class SurfaceFactory;
+class SurfaceManager;
+}  // namespace cc
 
 namespace blimp {
-
 class BlimpMessage;
 
 namespace client {
+class BlimpGpuMemoryBufferManager;

[David Trainor- moved to gerrit, 2016/08/22 23:58:10]

Why the Blimp subclass?

[Khushal, 2016/08/23 02:53:12]

Actually Not here. Its needed in the manager for the LayerTreeSettings but not
here.

 
 // The BlimpCompositorClient provides the BlimpCompositor with the necessary
 // dependencies for cc::LayerTreeHost owned by this compositor and for
@@ -51,8 +58,6 @@ class BlimpCompositorClient {
   virtual cc::TaskGraphRunner* GetTaskGraphRunner() = 0;
   virtual gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() = 0;
   virtual cc::ImageSerializationProcessor* GetImageSerializationProcessor() = 0;
-  virtual void DidCompleteSwapBuffers() = 0;
-  virtual void DidCommitAndDrawFrame() = 0;
 
   // Should send web gesture events which could not be handled locally by the
   // compositor to the engine.
@@ -71,51 +76,29 @@ class BlimpCompositorClient {
 };
 
 // BlimpCompositor provides the basic framework and setup to host a
-// LayerTreeHost.  The class that owns the LayerTreeHost is usually called the
-// compositor, but the LayerTreeHost does the compositing work.  The rendering
-// surface this compositor draws to is defined by the gfx::AcceleratedWidget set
-// by SetAcceleratedWidget().  This class should only be accessed from the main
-// thread.  Any interaction with the compositing thread should happen through
-// the LayerTreeHost.
-//
-// The Blimp compositor owns the remote client cc::LayerTreeHost, which performs
-// the compositing work for the remote server LayerTreeHost. The server
+// LayerTreeHost. This class owns the remote client cc::LayerTreeHost, which
+// performs the compositing work for the remote server LayerTreeHost. The server
 // LayerTreeHost for a BlimpCompositor is owned by the
 // content::RenderWidgetCompositor. Thus, each BlimpCompositor is tied to a
 // RenderWidget, identified by a custom |render_widget_id| generated on the
 // engine. The lifetime of this compositor is controlled by its corresponding
 // RenderWidget.
-class BlimpCompositor
-    : public cc::LayerTreeHostClient,
-      public cc::RemoteProtoChannel,
-      public BlimpInputManagerClient {
+// This class should only be accessed from the main thread.
+class BlimpCompositor : public cc::LayerTreeHostClient,
+                        public cc::RemoteProtoChannel,
+                        public BlimpInputManagerClient,
+                        public OutputSurfaceProxy,
+                        public cc::SurfaceFactoryClient {
  public:
-  BlimpCompositor(const int render_widget_id, BlimpCompositorClient* client);
+  BlimpCompositor(const int render_widget_id,
+                  cc::SurfaceManager* surface_manager,
+                  uint32_t surface_client_id,
+                  BlimpCompositorClient* client);
 
   ~BlimpCompositor() override;
 
-  // Sets whether or not this compositor actually draws to the output surface.
-  // Setting this to false will make the compositor drop all of its resources
-  // and the output surface.  Setting it to true again will rebuild the output
-  // surface from the gfx::AcceleratedWidget (see SetAcceleratedWidget).
-  // virtual for testing.
   virtual void SetVisible(bool visible);
 
-  // Lets this compositor know that it can draw to |widget|.  This means that,
-  // if this compositor is visible, it will build an output surface and GL
-  // context around |widget| and will draw to it.  ReleaseAcceleratedWidget()
-  // *must* be called before SetAcceleratedWidget() is called with the same
-  // gfx::AcceleratedWidget on another compositor.
-  // virtual for testing.
-  virtual void SetAcceleratedWidget(gfx::AcceleratedWidget widget);
-
-  // Releases the internally stored gfx::AcceleratedWidget and the associated
-  // output surface.  This must be called before calling
-  // SetAcceleratedWidget() with the same gfx::AcceleratedWidget on another
-  // compositor.
-  // virtual for testing.
-  virtual void ReleaseAcceleratedWidget();
-
   // Forwards the touch event to the |input_manager_|.
   // virtual for testing.
   virtual bool OnTouchEvent(const ui::MotionEvent& motion_event);
@@ -126,30 +109,33 @@ class BlimpCompositor
   virtual void OnCompositorMessageReceived(
       std::unique_ptr<cc::proto::CompositorMessage> message);
 
+  scoped_refptr<cc::Layer> layer() const { return layer_; }
+
   int render_widget_id() const { return render_widget_id_; }
 
  private:
   friend class BlimpCompositorForTesting;
 
   // LayerTreeHostClient implementation.
-  void WillBeginMainFrame() override;
-  void DidBeginMainFrame() override;
-  void BeginMainFrame(const cc::BeginFrameArgs& args) override;
-  void BeginMainFrameNotExpectedSoon() override;
-  void UpdateLayerTreeHost() override;
+  void WillBeginMainFrame() override {}

[David Trainor- moved to gerrit, 2016/08/22 23:58:10]

w00t so much nicer!

[Khushal, 2016/08/23 02:53:11]

:D

+  void DidBeginMainFrame() override {}
+  void BeginMainFrame(const cc::BeginFrameArgs& args) override {}
+  void BeginMainFrameNotExpectedSoon() override {}
+  void UpdateLayerTreeHost() override {}
   void ApplyViewportDeltas(const gfx::Vector2dF& inner_delta,
                            const gfx::Vector2dF& outer_delta,
                            const gfx::Vector2dF& elastic_overscroll_delta,
                            float page_scale,
-                           float top_controls_delta) override;
+                           float top_controls_delta) override {}
   void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface() override;
-  void DidFailToInitializeOutputSurface() override;
-  void WillCommit() override;
-  void DidCommit() override;
+  // TODO(khushalsagar): Need to handle context initialization failures.
+  void DidInitializeOutputSurface() override {}
+  void DidFailToInitializeOutputSurface() override {}
+  void WillCommit() override {}
+  void DidCommit() override {}
   void DidCommitAndDrawFrame() override;
-  void DidCompleteSwapBuffers() override;
-  void DidCompletePageScaleAnimation() override;
+  void DidCompleteSwapBuffers() override {}
+  void DidCompletePageScaleAnimation() override {}
 
   // RemoteProtoChannel implementation.
   void SetProtoReceiver(ProtoReceiver* receiver) override;
@@ -159,23 +145,29 @@ class BlimpCompositor
   void SendWebGestureEvent(
       const blink::WebGestureEvent& gesture_event) override;
 
-  // Internal method to correctly set the visibility on the |host_|. It will
-  // make the |host_| visible if |visible| is true and we have a valid |window_|
-  // If |visible_| is false, the host will also release its output surface.
-  void SetVisibleInternal(bool visible);
+  // OutputSurfaceProxy implementation.
+  void BindToClient(base::WeakPtr<OutputSurfaceProxyClient> client) override;
+  void SwapCompositorFrame(cc::CompositorFrame frame) override;
+  void DetachFromClient() override;
 
-  // Helper method to build the internal CC compositor instance from |message|.
+  // SurfaceFactoryClient implementation.
+  void ReturnResources(const cc::ReturnedResourceArray& resources) override;
+  void SetBeginFrameSource(cc::BeginFrameSource* begin_frame_source) override {}
+
+  // TODO(khushalsagar): Move all of this to the |DocumentView| or another
+  // platform specific class. So we use the DelegatedFrameHostAndroid like the
+  // RenderWidgetHostViewAndroid.
+  void DestroyDelegatedContent();
+
+  // Helper method to build the internal CC LayerTreeHost instance from
+  // |message|.
   void CreateLayerTreeHost(
       const cc::proto::InitializeImpl& initialize_message);
 
-  // Helper method to destroy the internal CC compositor instance and all its
+  // Helper method to destroy the internal CC LayerTreeHost instance and all its
   // associated state.
   void DestroyLayerTreeHost();
 
-  // Creates (if necessary) and returns a TaskRunner for a thread meant to run
-  // compositor rendering.
-  void HandlePendingOutputSurfaceRequest();
-
   // The unique identifier for the render widget for this compositor.
   const int render_widget_id_;
 
@@ -183,18 +175,29 @@ class BlimpCompositor
 
   std::unique_ptr<cc::LayerTreeHost> host_;
 
-  gfx::AcceleratedWidget window_;
-
   // Whether or not |host_| should be visible.  This is stored in case |host_|
-  // is null when SetVisible() is called or if we don't have a
-  // gfx::AcceleratedWidget to build an output surface from.
+  // is null when SetVisible() is called.
   bool host_should_be_visible_;
 
-  // Whether there is an OutputSurface request pending from the current
-  // |host_|. Becomes |true| if RequestNewOutputSurface is called, and |false|
-  // if |host_| is deleted or we succeed in creating *and* initializing an
-  // OutputSurface (which is essentially the contract with cc).
-  bool output_surface_request_pending_;
+  // The SurfaceFactory is bound to the lifetime of the
+  // OutputSurfaceProxyClient. When detached, the surface factory will be
+  // destroyed.
+  std::unique_ptr<cc::SurfaceFactory> surface_factory_;
+  base::WeakPtr<OutputSurfaceProxyClient> output_surface_proxy_client_;
+
+  // Data for the current frame.
+  cc::SurfaceId surface_id_;
+  gfx::Size current_surface_size_;
+
+  scoped_refptr<base::SingleThreadTaskRunner> compositor_task_runner_;
+
+  base::ThreadChecker thread_checker_;
+
+  // Surfaces related stuff and layer which holds the delegated content from the
+  // compositor.
+  cc::SurfaceManager* surface_manager_;
+  std::unique_ptr<cc::SurfaceIdAllocator> surface_id_allocator_;
+  scoped_refptr<cc::Layer> layer_;
 
   // To be notified of any incoming compositor protos that are specifically sent
   // to |render_widget_id_|.
@@ -207,6 +210,8 @@ class BlimpCompositor
   // widget.
   std::unique_ptr<BlimpInputManager> input_manager_;
 
+  base::WeakPtrFactory<BlimpCompositor> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(BlimpCompositor);
 };