Replace CompositorFrameSinkSupport::WillDrawSurface With RepeatingCallback

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>
 
@@ skipping 23 matching lines @@
 namespace cc {
 
 class BeginFrameSource;
 class CompositorFrame;
 class CopyOutputRequest;
 class SurfaceFactory;
 
 class CC_SURFACES_EXPORT Surface {
  public:
   using DrawCallback = SurfaceFactory::DrawCallback;
+  using WillDrawCallback = SurfaceFactory::WillDrawCallback;
 
   Surface(const SurfaceId& id, base::WeakPtr<SurfaceFactory> factory);
   ~Surface();
 
   const SurfaceId& surface_id() const { return surface_id_; }
   const SurfaceId& previous_frame_surface_id() const {
     return previous_frame_surface_id_;
   }
 
   void SetPreviousFrameSurface(Surface* surface);
 
-  void QueueFrame(CompositorFrame frame, const DrawCallback& draw_callback);
+  void QueueFrame(CompositorFrame frame,

[danakj, 2017/04/20 17:56:45]

Can you add a comment explaining what these 2 callbacks are, when they are
called, because they sound awfully alike but are very different.

[Alex Z., 2017/04/20 18:10:21]

Done.

+                  const DrawCallback& draw_callback,
+                  const WillDrawCallback& will_draw_callback);
   void EvictFrame();
   void RequestCopyOfOutput(std::unique_ptr<CopyOutputRequest> copy_request);
 
   // Notifies the Surface that a blocking SurfaceId now has an active frame.
   void NotifySurfaceIdAvailable(const SurfaceId& surface_id);
 
   void AddObserver(PendingFrameObserver* observer);
   void RemoveObserver(PendingFrameObserver* observer);
 
   // Called if a deadline has been hit and this surface is not yet active but
@@ skipping 11 matching lines @@
   const CompositorFrame& GetActiveFrame() const;
 
   // Returns the currently pending frame. You must check where HasPendingFrame()
   // returns true before calling this method.
   const CompositorFrame& GetPendingFrame();
 
   // Returns a number that increments by 1 every time a new frame is enqueued.
   int frame_index() const { return frame_index_; }
 
   void TakeLatencyInfo(std::vector<ui::LatencyInfo>* latency_info);
-  void RunDrawCallbacks();
+  void RunDrawCallback();
+  void RunWillDrawCallback(const gfx::Rect& damage_rect);
 
   base::WeakPtr<SurfaceFactory> factory() { return factory_; }
 
   // Add a SurfaceSequence that must be satisfied before the Surface is
   // destroyed.
   void AddDestructionDependency(SurfaceSequence sequence);
 
   // Satisfy all destruction dependencies that are contained in sequences, and
   // remove them from sequences.
   void SatisfyDestructionDependencies(
@@ skipping 14 matching lines @@
   }
 
   bool HasActiveFrame() const { return active_frame_data_.has_value(); }
   bool HasPendingFrame() const { return pending_frame_data_.has_value(); }
 
   bool destroyed() const { return destroyed_; }
   void set_destroyed(bool destroyed) { destroyed_ = destroyed; }
 
  private:
   struct FrameData {
-    FrameData(CompositorFrame&& frame, const DrawCallback& draw_callback);
+    FrameData(CompositorFrame&& frame,
+              const DrawCallback& draw_callback,
+              const WillDrawCallback& will_draw_callback);
     FrameData(FrameData&& other);
     ~FrameData();
     FrameData& operator=(FrameData&& other);
     CompositorFrame frame;
     DrawCallback draw_callback;
+    WillDrawCallback will_draw_callback;
   };
 
   void ActivatePendingFrame();
   // Called when all of the surface's dependencies have been resolved.
   void ActivateFrame(FrameData frame_data);
   void UpdateBlockingSurfaces(bool has_previous_pending_frame,
                               const CompositorFrame& current_frame);
 
   void UnrefFrameResourcesAndRunDrawCallback(
       base::Optional<FrameData> frame_data);
@@ skipping 21 matching lines @@
 
   SurfaceDependencies blocking_surfaces_;
   base::ObserverList<PendingFrameObserver, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(Surface);
 };
 
 }  // namespace cc
 
 #endif  // CC_SURFACES_SURFACE_H_