Move Work From CompositorFrameSinkSupport() To Init()

content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc

Index: content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc
diff --git a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc
index 7dd5c26eac56e9eb1f07cd7e5046104cc36841fc..35be482f240071dc8bac6ec35ace0d3d4e9694e8 100644
--- a/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc
+++ b/content/browser/renderer_host/offscreen_canvas_compositor_frame_sink.cc
@@ -18,12 +18,13 @@ OffscreenCanvasCompositorFrameSink::OffscreenCanvasCompositorFrameSink(
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
     : provider_(provider),
-      support_(this,
-               provider->GetSurfaceManager(),
-               frame_sink_id,
-               false /* is_root */,
-               true /* handles_frame_sink_id_invalidation */,
-               true /* needs_sync_points */),
+      support_(cc::CompositorFrameSinkSupport::Create(
+          this,
+          provider->GetSurfaceManager(),
+          frame_sink_id,
+          false /* is_root */,
+          true /* handles_frame_sink_id_invalidation */,
+          true /* needs_sync_points */)),
       client_(std::move(client)),
       binding_(this, std::move(request)) {
   binding_.set_connection_error_handler(
@@ -32,12 +33,12 @@ OffscreenCanvasCompositorFrameSink::OffscreenCanvasCompositorFrameSink(
 }
 
 OffscreenCanvasCompositorFrameSink::~OffscreenCanvasCompositorFrameSink() {
-  provider_->OnCompositorFrameSinkClientDestroyed(support_.frame_sink_id());
+  provider_->OnCompositorFrameSinkClientDestroyed(support_->frame_sink_id());
 }
 
 void OffscreenCanvasCompositorFrameSink::SetNeedsBeginFrame(
     bool needs_begin_frame) {
-  support_.SetNeedsBeginFrame(needs_begin_frame);
+  support_->SetNeedsBeginFrame(needs_begin_frame);
 }
 
 void OffscreenCanvasCompositorFrameSink::SubmitCompositorFrame(
@@ -45,16 +46,16 @@ void OffscreenCanvasCompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame) {
   // TODO(samans): This will need to do something similar to
   // GpuCompositorFrameSink.
-  support_.SubmitCompositorFrame(local_surface_id, std::move(frame));
+  support_->SubmitCompositorFrame(local_surface_id, std::move(frame));
 }
 
 void OffscreenCanvasCompositorFrameSink::BeginFrameDidNotSwap(
     const cc::BeginFrameAck& begin_frame_ack) {
-  support_.BeginFrameDidNotSwap(begin_frame_ack);
+  support_->BeginFrameDidNotSwap(begin_frame_ack);
 }
 
 void OffscreenCanvasCompositorFrameSink::EvictFrame() {
-  support_.EvictFrame();
+  support_->EvictFrame();
 }
 
 void OffscreenCanvasCompositorFrameSink::DidReceiveCompositorFrameAck() {
@@ -80,7 +81,7 @@ void OffscreenCanvasCompositorFrameSink::WillDrawSurface(
 
 void OffscreenCanvasCompositorFrameSink::OnClientConnectionLost() {
   provider_->OnCompositorFrameSinkClientConnectionLost(
-      support_.frame_sink_id());
+      support_->frame_sink_id());
 }
 
 }  // namespace content