| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 7004eb729b87a73496579923d50c100464e6c5be..b0e90fb4139164f11cbe53623147ca90b4c52112 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -87,7 +87,7 @@ class ThreadProxy : public Proxy,
|
| virtual void SetNeedsCommitOnImplThread() OVERRIDE;
|
| virtual void PostAnimationEventsToMainThreadOnImplThread(
|
| scoped_ptr<AnimationEventsVector> queue,
|
| - base::Time wall_clock_time) OVERRIDE;
|
| + base::TimeTicks clock_time) OVERRIDE;
|
| virtual bool ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes,
|
| int priority_cutoff)
|
| OVERRIDE;
|
| @@ -144,7 +144,7 @@ class ThreadProxy : public Proxy,
|
| void DidCommitAndDrawFrame();
|
| void DidCompleteSwapBuffers();
|
| void SetAnimationEvents(scoped_ptr<AnimationEventsVector> queue,
|
| - base::Time wall_clock_time);
|
| + base::TimeTicks clock_time);
|
| void DoCreateAndInitializeOutputSurface();
|
| // |capabilities| is set only when |success| is true.
|
| void OnOutputSurfaceInitializeAttempted(
|
|
|