| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 680a448cca32286a5995bef39d87bd9f6da40258..6fe5a3f8f3b1131fd11980a4cfdd5d557bc84649 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -106,6 +106,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;
|
| @@ -294,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;
|
|
|