| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 2a48e941ac402640595b9d81398a660954a2dc58..3c3673d2400a71ac1bbd91842f6093940b007d76 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -104,12 +104,14 @@ class ThreadProxy : public Proxy,
|
| virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE;
|
| virtual void ScheduledActionAcquireLayerTexturesForMainThread() OVERRIDE;
|
| virtual void ScheduledActionManageTiles() OVERRIDE;
|
| - virtual void DidAnticipatedDrawTimeChange(base::TimeTicks time) OVERRIDE;
|
| + virtual void DidAnticipatedDrawTimeChange(gfx::FrameTime time)
|
| + OVERRIDE;
|
| virtual base::TimeDelta DrawDurationEstimate() OVERRIDE;
|
| virtual base::TimeDelta BeginMainFrameToCommitDurationEstimate() OVERRIDE;
|
| virtual base::TimeDelta CommitToActivateDurationEstimate() OVERRIDE;
|
| - virtual void PostBeginImplFrameDeadline(const base::Closure& closure,
|
| - base::TimeTicks deadline) OVERRIDE;
|
| + virtual void PostBeginImplFrameDeadline(
|
| + const base::Closure& closure,
|
| + gfx::FrameTime deadline) OVERRIDE;
|
| virtual void DidBeginImplFrameDeadline() OVERRIDE;
|
|
|
| // ResourceUpdateControllerClient implementation
|
| @@ -123,7 +125,7 @@ class ThreadProxy : public Proxy,
|
| BeginMainFrameAndCommitState();
|
| ~BeginMainFrameAndCommitState();
|
|
|
| - base::TimeTicks monotonic_frame_begin_time;
|
| + gfx::FrameTime monotonic_frame_begin_time;
|
| scoped_ptr<ScrollAndScaleSet> scroll_info;
|
| size_t memory_allocation_limit_bytes;
|
| int memory_allocation_priority_cutoff;
|
|
|