GpuDisplayCompositorFrameSink => GpuRootCompositorFrameSink

components/display_compositor/gpu_compositor_frame_sink.h

Index: components/display_compositor/gpu_compositor_frame_sink.h
diff --git a/components/display_compositor/gpu_compositor_frame_sink.h b/components/display_compositor/gpu_compositor_frame_sink.h
index c724539d1067c63c9a990a5b785689eb5eb284bd..77f16a81680975a8dbdb61d3d394ccbecf5b2249 100644
--- a/components/display_compositor/gpu_compositor_frame_sink.h
+++ b/components/display_compositor/gpu_compositor_frame_sink.h
@@ -28,7 +28,9 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
  public:
   GpuCompositorFrameSink(
       GpuCompositorFrameSinkDelegate* delegate,
-      std::unique_ptr<cc::CompositorFrameSinkSupport>,
+      cc::SurfaceManager* surface_manager,

[danakj, 2017/02/23 22:13:44]

Does this class need to know about SurfaceManager* and FrameSinkRequest? Passing
in a CompositorFrameSinkSupport means this class only knows the minimum types it
needs to and doesn't introduce lifetime concerns and sudden additional
dependencies. It gives better encapsulations. I think this is regressing that.

[Fady Samuel, 2017/02/23 23:14:58]

Agreed but GpuCompositorFrameSink is a CompositorFrameSinkSupportClient and so I
can't avoid that unless I add a BindToClient or something on
CompositorFrameSinkSupport. That'll touch code all over the place, so I'll leave
that to a subsequent CL.

[danakj, 2017/02/23 23:17:33]

Ah I see, then there's a good reason at least, thanks.

+      const cc::FrameSinkId& frame_sink_id,
+      cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
@@ -51,11 +53,6 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
       std::unique_ptr<cc::CopyOutputRequest> request) override;
 
  protected:

[danakj, 2017/02/23 22:13:44]

Remove

[Fady Samuel, 2017/02/23 23:14:58]

Done.

-  void OnClientConnectionLost();
-  void OnPrivateConnectionLost();
-
-  GpuCompositorFrameSinkDelegate* const delegate_;
-  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
 
  private:
   // cc::CompositorFrameSinkSupportClient implementation:
@@ -65,10 +62,18 @@ class DISPLAY_COMPOSITOR_EXPORT GpuCompositorFrameSink
   void WillDrawSurface(const cc::LocalSurfaceId& local_surface_id,
                        const gfx::Rect& damage_rect) override;
 
+  void OnClientConnectionLost();
+  void OnPrivateConnectionLost();
+
+  GpuCompositorFrameSinkDelegate* const delegate_;
+  std::unique_ptr<cc::CompositorFrameSinkSupport> support_;
+
   bool client_connection_lost_ = false;
   bool private_connection_lost_ = false;
 
   cc::mojom::MojoCompositorFrameSinkClientPtr client_;
+  mojo::Binding<cc::mojom::MojoCompositorFrameSink>
+      compositor_frame_sink_binding_;
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate>
       compositor_frame_sink_private_binding_;