cc: Rename VSync to BeginFrame

cc/trees/thread_proxy.h

Index: cc/trees/thread_proxy.h
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
index 0360ca60bba1a8597adf211ed298ead9903b08e6..ae55ce2d20e30b1af87d7b88722ecf193a6b74b0 100644
--- a/cc/trees/thread_proxy.h
+++ b/cc/trees/thread_proxy.h
@@ -65,7 +65,7 @@ class ThreadProxy : public Proxy,
   virtual void OnSwapBuffersCompleteOnImplThread() OVERRIDE;
   virtual void OnVSyncParametersChanged(base::TimeTicks timebase,
                                         base::TimeDelta interval) OVERRIDE;
-  virtual void DidVSync(base::TimeTicks frame_time) OVERRIDE;
+  virtual void DidBeginImplFrame(base::TimeTicks frame_time) OVERRIDE;
   virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE;
   virtual void OnHasPendingTreeStateChanged(bool has_pending_tree) OVERRIDE;
   virtual void SetNeedsRedrawOnImplThread() OVERRIDE;
@@ -85,12 +85,12 @@ class ThreadProxy : public Proxy,
   virtual void RenewTreePriority() OVERRIDE;
   virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay)
       OVERRIDE;
-  virtual void DidReceiveLastInputEventForVSync(
+  virtual void DidReceiveLastInputEventForBeginImplFrame(
       base::TimeTicks frame_time) OVERRIDE;
   virtual void DidActivatePendingTree() OVERRIDE;
 
   // SchedulerClient implementation
-  virtual void ScheduledActionBeginFrame() OVERRIDE;
+  virtual void ScheduledActionBeginMainFrame() OVERRIDE;
   virtual ScheduledActionDrawAndSwapResult
       ScheduledActionDrawAndSwapIfPossible() OVERRIDE;
   virtual ScheduledActionDrawAndSwapResult ScheduledActionDrawAndSwapForced()
@@ -119,9 +119,9 @@ class ThreadProxy : public Proxy,
  private:
   ThreadProxy(LayerTreeHost* layer_tree_host, scoped_ptr<Thread> impl_thread);
 
-  struct BeginFrameAndCommitState {
-    BeginFrameAndCommitState();
-    ~BeginFrameAndCommitState();
+  struct BeginMainFrameAndCommitState {
+    BeginMainFrameAndCommitState();
+    ~BeginMainFrameAndCommitState();
 
     base::TimeTicks monotonic_frame_begin_time;
     scoped_ptr<ScrollAndScaleSet> scroll_info;
@@ -129,7 +129,8 @@ class ThreadProxy : public Proxy,
   };
 
   // Called on main thread.
-  void BeginFrame(scoped_ptr<BeginFrameAndCommitState> begin_frame_state);
+  void BeginMainFrame(
+      scoped_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
   void DidCommitAndDrawFrame();
   void DidCompleteSwapBuffers();
   void SetAnimationEvents(scoped_ptr<AnimationEventsVector> queue,
@@ -151,12 +152,12 @@ class ThreadProxy : public Proxy,
     CompletionEvent completion;
     bool commit_pending;
   };
-  void ForceBeginFrameOnImplThread(CompletionEvent* completion);
-  void BeginFrameCompleteOnImplThread(
+  void ForceBeginMainFrameOnImplThread(CompletionEvent* completion);
+  void BeginMainFrameCompleteOnImplThread(
       CompletionEvent* completion,
       ResourceUpdateQueue* queue,
       scoped_refptr<cc::ContextProvider> offscreen_context_provider);
-  void BeginFrameAbortedOnImplThread();
+  void BeginMainFrameAbortedOnImplThread();
   void RequestReadbackOnImplThread(ReadbackRequest* request);
   void FinishAllRenderingOnImplThread(CompletionEvent* completion);
   void InitializeImplOnImplThread(CompletionEvent* completion,
@@ -200,7 +201,7 @@ class ThreadProxy : public Proxy,
   bool commit_requested_;
   // Set by SetNeedsCommit and SetNeedsAnimate.
   bool commit_request_sent_to_impl_thread_;
-  // Set by BeginFrame
+  // Set by BeginMainFrame
   bool created_offscreen_context_provider_;
   base::CancelableClosure output_surface_creation_callback_;
   LayerTreeHost* layer_tree_host_;
@@ -226,9 +227,9 @@ class ThreadProxy : public Proxy,
 
   scoped_ptr<Scheduler> scheduler_on_impl_thread_;
 
-  // Set when the main thread is waiting on a ScheduledActionBeginFrame to be
-  // issued.
-  CompletionEvent* begin_frame_completion_event_on_impl_thread_;
+  // Set when the main thread is waiting on a ScheduledActionBeginMainFrame to
+  // be issued.
+  CompletionEvent* begin_main_frame_completion_event_on_impl_thread_;
 
   // Set when the main thread is waiting on a readback.
   ReadbackRequest* readback_request_on_impl_thread_;
@@ -249,15 +250,15 @@ class ThreadProxy : public Proxy,
   // thread.
   bool next_frame_is_newly_committed_frame_on_impl_thread_;
 
-  bool render_vsync_enabled_;
-  bool render_vsync_notification_enabled_;
-  bool synchronously_disable_vsync_;
+  bool throttle_frame_production_;
+  bool render_parent_drives_begin_impl_frame__;
+  bool using_synchronous_renderer_compositor_;
   VSyncClient* vsync_client_;
 
   bool inside_draw_;
 
   bool defer_commits_;
-  scoped_ptr<BeginFrameAndCommitState> pending_deferred_commit_;
+  scoped_ptr<BeginMainFrameAndCommitState> pending_deferred_commit_;
 
   base::TimeTicks smoothness_takes_priority_expiration_time_;
   bool renew_tree_priority_on_impl_thread_pending_;