cc: Handle retroactive BeginFrames in the Scheduler.

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 5bec9d1153eedb6682dfadb80585c5160f9ec9df..a5d4d7bc77b47badb8fa4551993cd439350543a3 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -69,7 +69,7 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
     int max_frames_pending;
     bool deferred_gl_initialization;
     bool draw_and_swap_full_viewport_every_frame;
-    // This doesn't handle the <webview> case, but once BeginImplFrame is
+    // This doesn't handle the <webview> case, but once BeginFrame is
     // supported natively, we shouldn't need adjust_deadline_for_parent.
     bool adjust_deadline_for_parent;
     // Whether this output surface renders to the default OpenGL zero
@@ -105,10 +105,9 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   // thread.
   virtual bool BindToClient(OutputSurfaceClient* client);
 
-  void InitializeBeginImplFrameEmulation(
-      base::SingleThreadTaskRunner* task_runner,
-      bool throttle_frame_production,
-      base::TimeDelta interval);
+  void InitializeBeginFrameEmulation(base::SingleThreadTaskRunner* task_runner,
+                                     bool throttle_frame_production,
+                                     base::TimeDelta interval);
 
   void SetMaxFramesPending(int max_frames_pending);
 
@@ -129,10 +128,10 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   // processing should be stopped, or lowered in priority.
   virtual void UpdateSmoothnessTakesPriority(bool prefer_smoothness) {}
 
-  // Requests a BeginImplFrame notification from the output surface. The
+  // Requests a BeginFrame notification from the output surface. The
   // notification will be delivered by calling
-  // OutputSurfaceClient::BeginImplFrame until the callback is disabled.
-  virtual void SetNeedsBeginImplFrame(bool enable);
+  // OutputSurfaceClient::BeginFrame until the callback is disabled.
+  virtual void SetNeedsBeginFrame(bool enable);
 
   bool HasClient() { return !!client_; }
 
@@ -165,7 +164,7 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   float device_scale_factor_;
 
   // The FrameRateController is deprecated.
-  // Platforms should move to native BeginImplFrames instead.
+  // Platforms should move to native BeginFrames instead.
   void CommitVSyncParameters(base::TimeTicks timebase,
                              base::TimeDelta interval);
   virtual void FrameRateControllerTick(bool throttled,
@@ -173,17 +172,17 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   scoped_ptr<FrameRateController> frame_rate_controller_;
   int max_frames_pending_;
   int pending_swap_buffers_;
-  bool needs_begin_impl_frame_;
-  bool client_ready_for_begin_impl_frame_;
+  bool needs_begin_frame_;
+  bool client_ready_for_begin_frame_;
 
-  // This stores a BeginImplFrame that we couldn't process immediately,
+  // This stores a BeginFrame that we couldn't process immediately,
   // but might process retroactively in the near future.
-  BeginFrameArgs skipped_begin_impl_frame_args_;
+  BeginFrameArgs skipped_begin_frame_args_;
 
   // Forwarded to OutputSurfaceClient but threaded through OutputSurface
   // first so OutputSurface has a chance to update the FrameRateController
   void SetNeedsRedrawRect(const gfx::Rect& damage_rect);
-  void BeginImplFrame(const BeginFrameArgs& args);
+  void BeginFrame(const BeginFrameArgs& args);
   void DidSwapBuffers();
   void OnSwapBuffersComplete();
   void ReclaimResources(const CompositorFrameAck* ack);
@@ -195,9 +194,9 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
                                   bool valid_for_tile_management);
 
   // virtual for testing.
-  virtual base::TimeTicks RetroactiveBeginImplFrameDeadline();
-  virtual void PostCheckForRetroactiveBeginImplFrame();
-  void CheckForRetroactiveBeginImplFrame();
+  virtual base::TimeTicks RetroactiveBeginFrameDeadline();
+  virtual void PostCheckForRetroactiveBeginFrame();
+  void CheckForRetroactiveBeginFrame();
 
  private:
   OutputSurfaceClient* client_;
@@ -207,9 +206,9 @@ class CC_EXPORT OutputSurface : public FrameRateControllerClient {
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
   void UpdateAndMeasureGpuLatency();
 
-  // check_for_retroactive_begin_impl_frame_pending_ is used to avoid posting
-  // redundant checks for a retroactive BeginImplFrame.
-  bool check_for_retroactive_begin_impl_frame_pending_;
+  // check_for_retroactive_begin_frame_pending_ is used to avoid posting
+  // redundant checks for a retroactive BeginFrame.
+  bool check_for_retroactive_begin_frame_pending_;
 
   bool external_stencil_test_enabled_;