| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index b105c9306d3d61dec18dd89bc6dd16961b930212..d2ff000d63d2d663f3bec52c2ce8f6212726fcc0 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -78,11 +78,13 @@ class ThreadProxy : public Proxy,
|
| virtual void BeginFrame(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;
|
| @@ -107,6 +109,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;
|
| @@ -288,7 +291,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;
|
|
|