Index: cc/trees/thread_proxy.h |
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h |
index 0360ca60bba1a8597adf211ed298ead9903b08e6..ca9ad6c66a1a323397d2b7b7ed32e22d9e264c43 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 DidBeginFrame(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,7 +85,7 @@ class ThreadProxy : public Proxy, |
virtual void RenewTreePriority() OVERRIDE; |
virtual void RequestScrollbarAnimationOnImplThread(base::TimeDelta delay) |
OVERRIDE; |
- virtual void DidReceiveLastInputEventForVSync( |
+ virtual void DidReceiveLastInputEventForBeginFrame( |
base::TimeTicks frame_time) OVERRIDE; |
virtual void DidActivatePendingTree() OVERRIDE; |
@@ -249,9 +249,9 @@ 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_begin_frame_notification_enabled_; |
+ bool using_synchronous_renderer_compositor_; |
VSyncClient* vsync_client_; |
bool inside_draw_; |