Add CompositorFrameSinkClientBinding To Be Used By FrameGenerator

services/ui/ws/frame_generator.cc

Index: services/ui/ws/frame_generator.cc
diff --git a/services/ui/ws/frame_generator.cc b/services/ui/ws/frame_generator.cc
index 6c695ba443d269bb74d9fe9ba2317fb2968ed7c3..b81d5068369a1503972a0fe2c764f61a068563a3 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -18,15 +18,9 @@ namespace ui {
 
 namespace ws {
 
-FrameGenerator::FrameGenerator(
-    std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink)
-    : compositor_frame_sink_(std::move(compositor_frame_sink)) {
-  compositor_frame_sink_->BindToClient(this);
-}
+FrameGenerator::FrameGenerator() = default;
 
-FrameGenerator::~FrameGenerator() {
-  compositor_frame_sink_->DetachFromClient();
-}
+FrameGenerator::~FrameGenerator() = default;
 
 void FrameGenerator::SetDeviceScaleFactor(float device_scale_factor) {
   if (device_scale_factor_ == device_scale_factor)
@@ -66,14 +60,10 @@ void FrameGenerator::OnWindowSizeChanged(const gfx::Size& pixel_size) {
   SetNeedsBeginFrame(true);
 }
 
-void FrameGenerator::SetBeginFrameSource(cc::BeginFrameSource* source) {
-  if (begin_frame_source_ && observing_begin_frames_)
-    begin_frame_source_->RemoveObserver(this);
-
-  begin_frame_source_ = source;
-
-  if (begin_frame_source_ && observing_begin_frames_)
-    begin_frame_source_->AddObserver(this);
+void FrameGenerator::Bind(
+    std::unique_ptr<CompositorFrameSinkClientBinding> binding) {
+  DCHECK(!client_binding_);
+  client_binding_ = std::move(binding);
 }
 
 void FrameGenerator::ReclaimResources(
@@ -83,28 +73,16 @@ void FrameGenerator::ReclaimResources(
   DCHECK(resources.empty());
 }
 
-void FrameGenerator::SetTreeActivationCallback(const base::Closure& callback) {}
-
-void FrameGenerator::DidReceiveCompositorFrameAck() {}
-
-void FrameGenerator::DidLoseCompositorFrameSink() {}
-
-void FrameGenerator::OnDraw(const gfx::Transform& transform,
-                            const gfx::Rect& viewport,
-                            bool resourceless_software_draw) {}
-
-void FrameGenerator::SetMemoryPolicy(const cc::ManagedMemoryPolicy& policy) {}
-
-void FrameGenerator::SetExternalTilePriorityConstraints(
-    const gfx::Rect& viewport_rect,
-    const gfx::Transform& transform) {}
+void FrameGenerator::DidReceiveCompositorFrameAck(
+    const cc::ReturnedResourceArray& resources) {}
 
 void FrameGenerator::OnBeginFrame(const cc::BeginFrameArgs& begin_frame_args) {
+  DCHECK(client_binding_);
   current_begin_frame_ack_ = cc::BeginFrameAck(
       begin_frame_args.source_id, begin_frame_args.sequence_number,
       begin_frame_args.sequence_number, false);
   if (begin_frame_args.type == cc::BeginFrameArgs::MISSED) {
-    begin_frame_source_->DidFinishFrame(this, current_begin_frame_ack_);
+    client_binding_->BeginFrameDidNotSwap(current_begin_frame_ack_);
     return;
   }
 
@@ -113,19 +91,17 @@ void FrameGenerator::OnBeginFrame(const cc::BeginFrameArgs& begin_frame_args) {
 
   // TODO(fsamuel): We should add a trace for generating a top level frame.
   cc::CompositorFrame frame(GenerateCompositorFrame());
-
-  compositor_frame_sink_->SubmitCompositorFrame(std::move(frame));
-
-  begin_frame_source_->DidFinishFrame(this, current_begin_frame_ack_);
+  gfx::Size frame_size = last_submitted_frame_size_;
+  if (!frame.render_pass_list.empty())

[Fady Samuel, 2017/05/19 12:10:15]

It is no longer possible for render_pass_list to be empty. Remove this line.

[Alex Z., 2017/05/19 13:26:53]

Done.

+    frame_size = frame.render_pass_list.back()->output_rect.size();
+  if (!local_surface_id_.is_valid() ||
+      frame_size != last_submitted_frame_size_) {

[Fady Samuel, 2017/05/19 12:10:15]

We should probably allocate a new ID if device scale factor changes too.

[Alex Z., 2017/05/19 13:26:53]

Done.

+    local_surface_id_ = id_allocator_.GenerateId();
+  }
+  client_binding_->SubmitCompositorFrame(local_surface_id_, std::move(frame));
   SetNeedsBeginFrame(false);
 }
 
-const cc::BeginFrameArgs& FrameGenerator::LastUsedBeginFrameArgs() const {
-  return last_begin_frame_args_;
-}
-
-void FrameGenerator::OnBeginFrameSourcePausedChanged(bool paused) {}
-
 cc::CompositorFrame FrameGenerator::GenerateCompositorFrame() {
   const int render_pass_id = 1;
   const gfx::Rect bounds(pixel_size_);
@@ -200,14 +176,7 @@ void FrameGenerator::DrawWindow(cc::RenderPass* pass) {
 
 void FrameGenerator::SetNeedsBeginFrame(bool needs_begin_frame) {
   needs_begin_frame &= window_manager_surface_info_.is_valid();
-  if (needs_begin_frame == observing_begin_frames_)
-    return;
-
-  observing_begin_frames_ = needs_begin_frame;
-  if (needs_begin_frame)
-    begin_frame_source_->AddObserver(this);
-  else
-    begin_frame_source_->RemoveObserver(this);
+  client_binding_->SetNeedsBeginFrame(needs_begin_frame);
 }
 
 }  // namespace ws