[cc] Plumb BeginFrameAcks through SurfaceManager to DisplayScheduler.

cc/surfaces/surface.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_SURFACES_SURFACE_H_
 #define CC_SURFACES_SURFACE_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <set>
 #include <unordered_set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
+#include "cc/output/compositor_frame.h"
 #include "cc/output/copy_output_request.h"
-#include "cc/surfaces/compositor_frame_sink_support.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "cc/surfaces/surface_sequence.h"
 #include "cc/surfaces/surfaces_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace ui {
 class LatencyInfo;
 }
 
 namespace cc {
 
-class CompositorFrame;
+class CompositorFrameSinkSupport;
 class CopyOutputRequest;
+class SurfaceManager;
 
 class CC_SURFACES_EXPORT Surface {
  public:
   using WillDrawCallback =
       base::RepeatingCallback<void(const LocalSurfaceId&, const gfx::Rect&)>;
 
+  // State of a CompositorFrame producer.
+  enum ProducerState {
+    IDLE,     // Has acknowledged the latest BeginFrame or is inactive.
+    PENDING,  // Waiting for response to the last BeginFrame.
+    READY     // A CompositorFrame was submitted but not yet drawn.
+  };
+
   Surface(
       const SurfaceId& id,
       base::WeakPtr<CompositorFrameSinkSupport> compositor_frame_sink_support);
   ~Surface();
 
   const SurfaceId& surface_id() const { return surface_id_; }
   const SurfaceId& previous_frame_surface_id() const {
     return previous_frame_surface_id_;
   }
 
@@ skipping 60 matching lines @@
                : nullptr;
   }
 
   const base::flat_set<SurfaceId>& blocking_surfaces() const {
     return blocking_surfaces_;
   }
 
   bool HasActiveFrame() const { return active_frame_data_.has_value(); }
   bool HasPendingFrame() const { return pending_frame_data_.has_value(); }
 
+  // Get/Set the state of the producer that submits CompositorFrames to this
+  // surface.
+  ProducerState GetProducerState() const { return producer_state_; }
+  void SetProducerState(ProducerState state);
+
   bool destroyed() const { return destroyed_; }
   void set_destroyed(bool destroyed) { destroyed_ = destroyed; }
 
  private:
   struct FrameData {
     FrameData(CompositorFrame&& frame,
               const base::Closure& draw_callback,
               const WillDrawCallback& will_draw_callback);
     FrameData(FrameData&& other);
     ~FrameData();
@@ skipping 30 matching lines @@
 
   base::Optional<FrameData> pending_frame_data_;
   base::Optional<FrameData> active_frame_data_;
   int frame_index_;
   bool closed_ = false;
   bool destroyed_;
   std::vector<SurfaceSequence> destruction_dependencies_;
 
   base::flat_set<SurfaceId> blocking_surfaces_;
 
+  // The current state of the producer that submits CompositorFrames to this
+  // surface. This state helps the DisplayScheduler decide whether to wait for
+  // damage on this surface.
+  ProducerState producer_state_ = IDLE;
+
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_H_