Extract non-Mojo bits of GpuCompositorFrameSink to CompositorFrameSinkSupport

services/ui/surfaces/gpu_compositor_frame_sink.cc

Index: services/ui/surfaces/gpu_compositor_frame_sink.cc
diff --git a/services/ui/surfaces/gpu_compositor_frame_sink.cc b/services/ui/surfaces/gpu_compositor_frame_sink.cc
index e2019a6acc66cd74f8ef5b2f6d26abbd0b5003b6..22f127935e215bcbffef2482c5e9118c118e89c7 100644
--- a/services/ui/surfaces/gpu_compositor_frame_sink.cc
+++ b/services/ui/surfaces/gpu_compositor_frame_sink.cc
@@ -4,16 +4,6 @@
 
 #include "services/ui/surfaces/gpu_compositor_frame_sink.h"
 
-#include "base/callback.h"
-#include "base/message_loop/message_loop.h"
-#include "base/single_thread_task_runner.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "cc/output/compositor_frame.h"
-#include "cc/output/output_surface.h"
-#include "cc/quads/shared_quad_state.h"
-#include "cc/quads/surface_draw_quad.h"
-#include "cc/scheduler/begin_frame_source.h"
-#include "cc/surfaces/display.h"
 #include "services/ui/surfaces/display_compositor.h"
 
 namespace ui {
@@ -25,23 +15,14 @@ GpuCompositorFrameSink::GpuCompositorFrameSink(
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client)
-    : frame_sink_id_(frame_sink_id),
-      display_compositor_(display_compositor),
-      display_(std::move(display)),
-      surface_factory_(frame_sink_id_, display_compositor_->manager(), this),
+    : display_compositor_(display_compositor),
+      support_(this,
+               display_compositor->manager(),
+               frame_sink_id,
+               std::move(display)),
       client_(std::move(client)),
       binding_(this, std::move(request)),
-      private_binding_(this, std::move(private_request)),
-      weak_factory_(this) {
-  display_compositor_->manager()->RegisterFrameSinkId(frame_sink_id_);
-  display_compositor_->manager()->RegisterSurfaceFactoryClient(frame_sink_id_,
-                                                               this);
-
-  if (display_) {
-    display_->Initialize(this, display_compositor_->manager());
-    display_->SetVisible(true);
-  }
-
+      private_binding_(this, std::move(private_request)) {
   binding_.set_connection_error_handler(base::Bind(
       &GpuCompositorFrameSink::OnClientConnectionLost, base::Unretained(this)));
 
@@ -50,147 +31,64 @@ GpuCompositorFrameSink::GpuCompositorFrameSink(
                  base::Unretained(this)));
 }
 
-GpuCompositorFrameSink::~GpuCompositorFrameSink() {
-  // SurfaceFactory's destructor will attempt to return resources which will
-  // call back into here and access |client_| so we should destroy
-  // |surface_factory_|'s resources early on.
-  surface_factory_.EvictSurface();
-  display_compositor_->manager()->UnregisterSurfaceFactoryClient(
-      frame_sink_id_);
-  display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
+GpuCompositorFrameSink::~GpuCompositorFrameSink() {}
+
+void GpuCompositorFrameSink::EvictFrame() {
+  support_.EvictFrame();
 }
 
 void GpuCompositorFrameSink::SetNeedsBeginFrame(bool needs_begin_frame) {
-  needs_begin_frame_ = needs_begin_frame;
-  UpdateNeedsBeginFramesInternal();
+  support_.SetNeedsBeginFrame(needs_begin_frame);
 }
 
 void GpuCompositorFrameSink::SubmitCompositorFrame(
     const cc::LocalFrameId& local_frame_id,
     cc::CompositorFrame frame) {
-  // If the size of the CompostiorFrame has changed then destroy the existing
-  // Surface and create a new one of the appropriate size.
-  if (local_frame_id_ != local_frame_id) {
-    local_frame_id_ = local_frame_id;
-    if (display_ && !frame.render_pass_list.empty()) {
-      gfx::Size frame_size = frame.render_pass_list[0]->output_rect.size();
-      display_->Resize(frame_size);
-    }
-  }
-  ++ack_pending_count_;
-  surface_factory_.SubmitCompositorFrame(
-      local_frame_id_, std::move(frame),
-      base::Bind(&GpuCompositorFrameSink::DidReceiveCompositorFrameAck,
-                 weak_factory_.GetWeakPtr()));
-  if (display_) {
-    display_->SetLocalFrameId(local_frame_id_,
-                              frame.metadata.device_scale_factor);
-  }
-}
-
-void GpuCompositorFrameSink::EvictFrame() {
-  surface_factory_.EvictSurface();
+  support_.SubmitCompositorFrame(local_frame_id, std::move(frame));
 }
 
 void GpuCompositorFrameSink::DidReceiveCompositorFrameAck() {
-  if (!client_)
-    return;
   client_->DidReceiveCompositorFrameAck();
-  DCHECK_GT(ack_pending_count_, 0);
-  if (!surface_returned_resources_.empty()) {
-    client_->ReclaimResources(surface_returned_resources_);
-    surface_returned_resources_.clear();
-  }
-  ack_pending_count_--;
 }
 
 void GpuCompositorFrameSink::AddChildFrameSink(
     const cc::FrameSinkId& child_frame_sink_id) {
-  cc::SurfaceManager* surface_manager = display_compositor_->manager();
-  surface_manager->RegisterFrameSinkHierarchy(frame_sink_id_,
-                                              child_frame_sink_id);
+  support_.AddChildFrameSink(child_frame_sink_id);
 }
 
 void GpuCompositorFrameSink::RemoveChildFrameSink(
     const cc::FrameSinkId& child_frame_sink_id) {
-  cc::SurfaceManager* surface_manager = display_compositor_->manager();
-  surface_manager->UnregisterFrameSinkHierarchy(frame_sink_id_,
-                                                child_frame_sink_id);
-}
-
-void GpuCompositorFrameSink::DisplayOutputSurfaceLost() {}
-
-void GpuCompositorFrameSink::DisplayWillDrawAndSwap(
-    bool will_draw_and_swap,
-    const cc::RenderPassList& render_passes) {}
-
-void GpuCompositorFrameSink::DisplayDidDrawAndSwap() {}
-
-void GpuCompositorFrameSink::ReturnResources(
-    const cc::ReturnedResourceArray& resources) {
-  if (resources.empty())
-    return;
-
-  if (!ack_pending_count_ && client_) {
-    client_->ReclaimResources(resources);
-    return;
-  }
-
-  std::copy(resources.begin(), resources.end(),
-            std::back_inserter(surface_returned_resources_));
-}
-
-void GpuCompositorFrameSink::SetBeginFrameSource(
-    cc::BeginFrameSource* begin_frame_source) {
-  // TODO(tansell): Implement this.
-  if (begin_frame_source_ && added_frame_observer_) {
-    begin_frame_source_->RemoveObserver(this);
-    added_frame_observer_ = false;
-  }
-  begin_frame_source_ = begin_frame_source;
-  UpdateNeedsBeginFramesInternal();
+  support_.RemoveChildFrameSink(child_frame_sink_id);
 }
 
 void GpuCompositorFrameSink::OnBeginFrame(const cc::BeginFrameArgs& args) {
-  UpdateNeedsBeginFramesInternal();
-  last_begin_frame_args_ = args;
   if (client_)
     client_->OnBeginFrame(args);
 }
 
-const cc::BeginFrameArgs& GpuCompositorFrameSink::LastUsedBeginFrameArgs()
-    const {
-  return last_begin_frame_args_;
+void GpuCompositorFrameSink::ReclaimResources(
+    const cc::ReturnedResourceArray& resources) {
+  if (client_)
+    client_->ReclaimResources(resources);
 }
 
-void GpuCompositorFrameSink::OnBeginFrameSourcePausedChanged(bool paused) {}
-
-void GpuCompositorFrameSink::UpdateNeedsBeginFramesInternal() {
-  if (!begin_frame_source_)
-    return;
-
-  if (needs_begin_frame_ == added_frame_observer_)
-    return;
-
-  added_frame_observer_ = needs_begin_frame_;
-  if (needs_begin_frame_)
-    begin_frame_source_->AddObserver(this);
-  else
-    begin_frame_source_->RemoveObserver(this);
+void GpuCompositorFrameSink::WillDrawSurface() {
+  if (client_)
+    client_->WillDrawSurface();
 }
 
 void GpuCompositorFrameSink::OnClientConnectionLost() {
   client_connection_lost_ = true;
   // Request destruction of |this| only if both connections are lost.
   display_compositor_->OnCompositorFrameSinkClientConnectionLost(
-      frame_sink_id_, private_connection_lost_);
+      support_.frame_sink_id(), private_connection_lost_);
 }
 
 void GpuCompositorFrameSink::OnPrivateConnectionLost() {
   private_connection_lost_ = true;
   // Request destruction of |this| only if both connections are lost.
   display_compositor_->OnCompositorFrameSinkPrivateConnectionLost(
-      frame_sink_id_, client_connection_lost_);
+      support_.frame_sink_id(), client_connection_lost_);
 }
 
 }  // namespace ui