| Index: cc/test/layer_tree_test_common.h
|
| diff --git a/cc/test/layer_tree_test_common.h b/cc/test/layer_tree_test_common.h
|
| index d1378c8ece1660e71947701f532a7a18b3477fbf..ea82b05ac73a2f1442d83cab503239bb47a9d5c4 100644
|
| --- a/cc/test/layer_tree_test_common.h
|
| +++ b/cc/test/layer_tree_test_common.h
|
| @@ -30,10 +30,10 @@ public:
|
| virtual void commitCompleteOnThread(cc::LayerTreeHostImpl*) { }
|
| virtual bool prepareToDrawOnThread(cc::LayerTreeHostImpl*);
|
| virtual void drawLayersOnThread(cc::LayerTreeHostImpl*) { }
|
| - virtual void animateLayers(cc::LayerTreeHostImpl*, double monotonicTime) { }
|
| - virtual void willAnimateLayers(cc::LayerTreeHostImpl*, double monotonicTime) { }
|
| + virtual void animateLayers(cc::LayerTreeHostImpl*, base::TimeTicks monotonicTime) { }
|
| + virtual void willAnimateLayers(cc::LayerTreeHostImpl*, base::TimeTicks monotonicTime) { }
|
| virtual void applyScrollAndScale(const cc::IntSize&, float) { }
|
| - virtual void animate(double monotonicTime) { }
|
| + virtual void animate(base::TimeTicks monotonicTime) { }
|
| virtual void layout() { }
|
| virtual void didRecreateOutputSurface(bool succeeded) { }
|
| virtual void didAddAnimation() { }
|
| @@ -158,7 +158,7 @@ public:
|
| using LayerTreeHostImpl::calculateRenderSurfaceLayerList;
|
|
|
| protected:
|
| - virtual void animateLayers(double monotonicTime, double wallClockTime) OVERRIDE;
|
| + virtual void animateLayers(base::TimeTicks monotonicTime, base::Time wallClockTime) OVERRIDE;
|
| virtual base::TimeDelta lowFrequencyAnimationInterval() const OVERRIDE;
|
|
|
| private:
|
|
|