cc: Rename SwapBuffers on CompositorFrameSink to SubmitCompositorFrame

cc/scheduler/scheduler.h

 // Copyright 2011 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_SCHEDULER_SCHEDULER_H_
 #define CC_SCHEDULER_SCHEDULER_H_
 
 #include <deque>
 #include <memory>
 #include <string>
@@ skipping 20 matching lines @@
 
 namespace cc {
 
 class CompositorTimingHistory;
 
 class SchedulerClient {
  public:
   virtual void WillBeginImplFrame(const BeginFrameArgs& args) = 0;
   virtual void ScheduledActionSendBeginMainFrame(
       const BeginFrameArgs& args) = 0;
-  virtual DrawResult ScheduledActionDrawAndSwapIfPossible() = 0;
-  virtual DrawResult ScheduledActionDrawAndSwapForced() = 0;
+  virtual DrawResult ScheduledActionDrawIfPossible() = 0;
+  virtual DrawResult ScheduledActionDrawForced() = 0;
   virtual void ScheduledActionCommit() = 0;
   virtual void ScheduledActionActivateSyncTree() = 0;
   virtual void ScheduledActionBeginCompositorFrameSinkCreation() = 0;
   virtual void ScheduledActionPrepareTiles() = 0;
   virtual void ScheduledActionInvalidateCompositorFrameSink() = 0;
   virtual void DidFinishImplFrame() = 0;
   virtual void SendBeginMainFrameNotExpectedSoon() = 0;
 
  protected:
   virtual ~SchedulerClient() {}
@@ skipping 29 matching lines @@
 
   void SetNeedsBeginMainFrame();
   // Requests a single impl frame (after the current frame if there is one
   // active).
   void SetNeedsOneBeginImplFrame();
 
   void SetNeedsRedraw();
 
   void SetNeedsPrepareTiles();
 
-  void DidSwapBuffers();
-  void DidSwapBuffersComplete();
+  // Drawing should result in submitting a CompositorFrame to the
+  // CompositorFrameSink and then calling this.
+  void DidSubmitCompositorFrame();
+  // The CompositorFrameSink acks when it is ready for a new frame which
+  // should result in this getting called to unblock the next draw.
+  void DidReceiveCompositorFrameAck();
 
   void SetTreePrioritiesAndScrollState(TreePriority tree_priority,
                                        ScrollHandlerState scroll_handler_state);
 
   void NotifyReadyToCommit();
   void BeginMainFrameAborted(CommitEarlyOutReason reason);
   void DidCommit();
 
   void WillPrepareTiles();
   void DidPrepareTiles();
@@ skipping 63 matching lines @@
   bool inside_process_scheduled_actions_;
   SchedulerStateMachine::Action inside_action_;
 
   bool stopped_;
 
  private:
   void ScheduleBeginImplFrameDeadline();
   void ScheduleBeginImplFrameDeadlineIfNeeded();
   void BeginImplFrameNotExpectedSoon();
   void SetupNextBeginFrameIfNeeded();
-  void DrawAndSwapIfPossible();
-  void DrawAndSwapForced();
+  void DrawIfPossible();
+  void DrawForced();
   void ProcessScheduledActions();
   void UpdateCompositorTimingHistoryRecordingEnabled();
   bool ShouldRecoverMainLatency(const BeginFrameArgs& args,
                                 bool can_activate_before_deadline) const;
   bool ShouldRecoverImplLatency(const BeginFrameArgs& args,
                                 bool can_activate_before_deadline) const;
   bool CanBeginMainFrameAndActivateBeforeDeadline(
       const BeginFrameArgs& args,
       base::TimeDelta bmf_to_activate_estimate) const;
   void AdvanceCommitStateIfPossible();
@@ skipping 10 matching lines @@
   }
 
   base::WeakPtrFactory<Scheduler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Scheduler);
 };
 
 }  // namespace cc
 
 #endif  // CC_SCHEDULER_SCHEDULER_H_