Make RendererCompositorFrameSink derive from ClientCompositorFrameSink

content/renderer/gpu/renderer_compositor_frame_sink.h

Index: content/renderer/gpu/renderer_compositor_frame_sink.h
diff --git a/content/renderer/gpu/renderer_compositor_frame_sink.h b/content/renderer/gpu/renderer_compositor_frame_sink.h
index 4de0926ff2eeb68bafc2d7f9d11d57f93f77ec9d..934d799d576c7c82bf2c5bf139f592ab99affead 100644
--- a/content/renderer/gpu/renderer_compositor_frame_sink.h
+++ b/content/renderer/gpu/renderer_compositor_frame_sink.h
@@ -24,6 +24,7 @@
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/surfaces/local_surface_id.h"
 #include "cc/surfaces/local_surface_id_allocator.h"
+#include "components/viz/client/client_compositor_frame_sink.h"
 #include "content/common/render_widget_surface_properties.h"
 #include "content/renderer/gpu/compositor_forwarding_message_filter.h"
 #include "ipc/ipc_sync_message_filter.h"
@@ -45,10 +46,7 @@ class FrameSwapMessageQueue;
 // This class can be created only on the main thread, but then becomes pinned
 // to a fixed thread when BindToClient is called.
 class RendererCompositorFrameSink
-    : NON_EXPORTED_BASE(public cc::CompositorFrameSink),
-      NON_EXPORTED_BASE(public base::NonThreadSafe),
-      NON_EXPORTED_BASE(public cc::mojom::MojoCompositorFrameSinkClient),
-      public cc::ExternalBeginFrameSourceClient {
+    : NON_EXPORTED_BASE(public viz::ClientCompositorFrameSink) {
  public:
   RendererCompositorFrameSink(
       int32_t routing_id,
@@ -71,11 +69,10 @@ class RendererCompositorFrameSink
       scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue);
   ~RendererCompositorFrameSink() override;
 
-  // cc::CompositorFrameSink implementation.
+  // Overriden from viz::ClientCompositorFrameSink.
   bool BindToClient(cc::CompositorFrameSinkClient* client) override;
   void DetachFromClient() override;
   void SubmitCompositorFrame(cc::CompositorFrame frame) override;
-  void DidNotProduceFrame(const cc::BeginFrameAck& ack) override;
 
  private:
   class RendererCompositorFrameSinkProxy
@@ -100,15 +97,6 @@ class RendererCompositorFrameSink
 
   void OnMessageReceived(const IPC::Message& message);
 
-  // cc::mojom::MojoCompositorFrameSinkClient implementation.
-  void DidReceiveCompositorFrameAck(
-      const cc::ReturnedResourceArray& resources) override;
-  void OnBeginFrame(const cc::BeginFrameArgs& args) override;
-  void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
-
-  // cc::ExternalBeginFrameSourceClient implementation.
-  void OnNeedsBeginFrames(bool need_begin_frames) override;
-
   scoped_refptr<CompositorForwardingMessageFilter>
       compositor_frame_sink_filter_;
   CompositorForwardingMessageFilter::Handler
@@ -116,20 +104,11 @@ class RendererCompositorFrameSink
   scoped_refptr<RendererCompositorFrameSinkProxy> compositor_frame_sink_proxy_;
   scoped_refptr<IPC::SyncMessageFilter> message_sender_;
   scoped_refptr<FrameSwapMessageQueue> frame_swap_message_queue_;
-  std::unique_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
-  std::unique_ptr<cc::ExternalBeginFrameSource> external_begin_frame_source_;
   int routing_id_;
 
   cc::LocalSurfaceId local_surface_id_;
   cc::LocalSurfaceIdAllocator id_allocator_;

[piman, 2017/05/26 21:34:02]

These duplicate (and hide) the ClientCompositorFrameSink ones. Could we share?

[Saman Sami, 2017/05/29 15:24:45]

I removed the one in RendererCompositorFrameSink.

   RenderWidgetSurfaceProperties current_surface_properties_;
-
-  base::ThreadChecker thread_checker_;
-
-  cc::mojom::MojoCompositorFrameSinkPtr sink_;
-  cc::mojom::MojoCompositorFrameSinkPtrInfo sink_info_;
-  cc::mojom::MojoCompositorFrameSinkClientRequest sink_client_request_;
-  mojo::Binding<cc::mojom::MojoCompositorFrameSinkClient> sink_client_binding_;
 };
 
 }  // namespace content