| Index: cc/single_thread_proxy.h
|
| diff --git a/cc/single_thread_proxy.h b/cc/single_thread_proxy.h
|
| index ca6769f42190ab2603ca7b7d2e843f026a495737..93f8c09a6a3bc927c71cbe1c9a6532f96695d487 100644
|
| --- a/cc/single_thread_proxy.h
|
| +++ b/cc/single_thread_proxy.h
|
| @@ -23,7 +23,7 @@ public:
|
|
|
| // Proxy implementation
|
| virtual bool compositeAndReadback(void *pixels, const IntRect&) OVERRIDE;
|
| - virtual void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, double duration) OVERRIDE;
|
| + virtual void startPageScaleAnimation(const IntSize& targetPosition, bool useAnchor, float scale, base::TimeDelta duration) OVERRIDE;
|
| virtual void finishAllRendering() OVERRIDE;
|
| virtual bool isStarted() const OVERRIDE;
|
| virtual bool initializeContext() OVERRIDE;
|
| @@ -49,11 +49,11 @@ public:
|
| // LayerTreeHostImplClient implementation
|
| virtual void didLoseContextOnImplThread() OVERRIDE { }
|
| virtual void onSwapBuffersCompleteOnImplThread() OVERRIDE;
|
| - virtual void onVSyncParametersChanged(double monotonicTimebase, double intervalInSeconds) OVERRIDE { }
|
| + virtual void onVSyncParametersChanged(base::TimeTicks timebase, base::TimeDelta interval) OVERRIDE { }
|
| virtual void onCanDrawStateChanged(bool canDraw) OVERRIDE { }
|
| virtual void setNeedsRedrawOnImplThread() OVERRIDE;
|
| virtual void setNeedsCommitOnImplThread() OVERRIDE;
|
| - virtual void postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector>, double wallClockTime) OVERRIDE;
|
| + virtual void postAnimationEventsToMainThreadOnImplThread(scoped_ptr<AnimationEventsVector>, base::Time wallClockTime) OVERRIDE;
|
| virtual bool reduceContentsTextureMemoryOnImplThread(size_t limitBytes, int priorityCutoff) OVERRIDE;
|
| virtual void sendManagedMemoryStats() OVERRIDE;
|
|
|
|
|