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..6ee89f7136c73d9e7ccc4b66ee6cc52507fc6e85 100644
--- a/services/ui/ws/frame_generator.cc
+++ b/services/ui/ws/frame_generator.cc
@@ -18,21 +18,15 @@ 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)
     return;
   device_scale_factor_ = device_scale_factor;
-  SetNeedsBeginFrame(true);
+  client_binding_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::SetHighContrastMode(bool enabled) {
@@ -40,22 +34,21 @@ void FrameGenerator::SetHighContrastMode(bool enabled) {
     return;
 
   high_contrast_mode_enabled_ = enabled;
-  SetNeedsBeginFrame(true);
+  client_binding_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::OnSurfaceCreated(const cc::SurfaceInfo& surface_info) {
   DCHECK(surface_info.is_valid());
-
   // Only handle embedded surfaces changing here. The display root surface
   // changing is handled immediately after the CompositorFrame is submitted.
   if (surface_info != window_manager_surface_info_) {
     window_manager_surface_info_ = surface_info;
-    SetNeedsBeginFrame(true);
+    client_binding_->SetNeedsBeginFrame(true);
   }
 }
 
 void FrameGenerator::OnWindowDamaged() {
-  SetNeedsBeginFrame(true);
+  client_binding_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::OnWindowSizeChanged(const gfx::Size& pixel_size) {
@@ -63,17 +56,13 @@ void FrameGenerator::OnWindowSizeChanged(const gfx::Size& pixel_size) {
     return;
 
   pixel_size_ = pixel_size;
-  SetNeedsBeginFrame(true);
+  client_binding_->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,49 +72,26 @@ 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_);
+  if (begin_frame_args.type == cc::BeginFrameArgs::MISSED)

[Fady Samuel, 2017/05/17 20:33:04]

I think you need to add a BeginFrameDidNotSwap to the binding?

[Alex Z., 2017/05/17 21:30:52]

Done.

     return;
-  }
 
   current_begin_frame_ack_.has_damage = true;
   last_begin_frame_args_ = 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_);
-  SetNeedsBeginFrame(false);
-}
-
-const cc::BeginFrameArgs& FrameGenerator::LastUsedBeginFrameArgs() const {
-  return last_begin_frame_args_;
+  client_binding_->SubmitCompositorFrame(std::move(frame));
+  client_binding_->SetNeedsBeginFrame(false);
 }
 
-void FrameGenerator::OnBeginFrameSourcePausedChanged(bool paused) {}
-
 cc::CompositorFrame FrameGenerator::GenerateCompositorFrame() {
   const int render_pass_id = 1;
   const gfx::Rect bounds(pixel_size_);
@@ -198,18 +164,6 @@ void FrameGenerator::DrawWindow(cc::RenderPass* pass) {
                cc::SurfaceDrawQuadType::PRIMARY, nullptr);
 }
 
-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);
-}
-
 }  // namespace ws
 
 }  // namespace ui