Index: cc/trees/thread_proxy.h |
diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h |
index c0203af10538a664d20ebe065402cece4a4a474b..1d41f6688b7dccf6f913d516f448d0f2c318403e 100644 |
--- a/cc/trees/thread_proxy.h |
+++ b/cc/trees/thread_proxy.h |
@@ -78,11 +78,13 @@ class ThreadProxy : public Proxy, |
virtual void BeginImplFrame(const BeginFrameArgs& args) OVERRIDE; |
virtual void OnCanDrawStateChanged(bool can_draw) OVERRIDE; |
virtual void NotifyReadyToActivate() OVERRIDE; |
- // Please call these 2 functions through |
- // LayerTreeHostImpl's SetNeedsRedraw() and SetNeedsRedrawRect(). |
+ // Please call these 3 functions through |
+ // LayerTreeHostImpl's SetNeedsRedraw(), SetNeedsRedrawRect() and |
+ // SetNeedsAnimate(). |
virtual void SetNeedsRedrawOnImplThread() OVERRIDE; |
virtual void SetNeedsRedrawRectOnImplThread(const gfx::Rect& dirty_rect) |
OVERRIDE; |
+ virtual void SetNeedsAnimateOnImplThread() OVERRIDE; |
virtual void SetNeedsManageTilesOnImplThread() OVERRIDE; |
virtual void DidInitializeVisibleTileOnImplThread() OVERRIDE; |
virtual void SetNeedsCommitOnImplThread() OVERRIDE; |
@@ -106,6 +108,7 @@ class ThreadProxy : public Proxy, |
OVERRIDE; |
virtual DrawSwapReadbackResult ScheduledActionDrawAndSwapForced() OVERRIDE; |
virtual DrawSwapReadbackResult ScheduledActionDrawAndReadback() OVERRIDE; |
+ virtual void ScheduledActionAnimate() OVERRIDE; |
virtual void ScheduledActionCommit() OVERRIDE; |
virtual void ScheduledActionUpdateVisibleTiles() OVERRIDE; |
virtual void ScheduledActionActivatePendingTree() OVERRIDE; |
@@ -292,7 +295,7 @@ class ThreadProxy : public Proxy, |
// Set when we freeze animations to avoid checkerboarding. |
bool animations_frozen_until_next_draw; |
- base::TimeTicks animation_freeze_time; |
+ base::TimeTicks animation_time; |
base::TimeTicks smoothness_takes_priority_expiration_time; |
bool renew_tree_priority_pending; |