| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index 3844a844ee9e6c0685ae6b08100c798ad1dcc44b..ccfb625cd73a6470799122aef185a3fd5f77a3de 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -74,7 +74,7 @@ class LayerTreeHostImplClient {
|
| virtual void SetNeedsManageTilesOnImplThread() = 0;
|
| virtual void PostAnimationEventsToMainThreadOnImplThread(
|
| scoped_ptr<AnimationEventsVector> events,
|
| - base::Time wall_clock_time) = 0;
|
| + base::TimeTicks clock_time) = 0;
|
| // Returns true if resources were deleted by this call.
|
| virtual bool ReduceContentsTextureMemoryOnImplThread(
|
| size_t limit_bytes,
|
| @@ -166,8 +166,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| virtual void BeginMainFrameAborted(bool did_handle);
|
| virtual void BeginCommit();
|
| virtual void CommitComplete();
|
| - virtual void Animate(base::TimeTicks monotonic_time,
|
| - base::Time wall_clock_time);
|
| + virtual void Animate(base::TimeTicks monotonic_time);
|
| virtual void UpdateAnimationState(bool start_ready_animations);
|
| void MainThreadHasStoppedFlinging();
|
| void UpdateBackgroundAnimateTicking(bool should_background_tick);
|
| @@ -386,7 +385,6 @@ class CC_EXPORT LayerTreeHostImpl
|
|
|
| void ResetCurrentFrameTimeForNextFrame();
|
| virtual base::TimeTicks CurrentFrameTimeTicks();
|
| - base::Time CurrentFrameTime();
|
|
|
| virtual base::TimeTicks CurrentPhysicalTimeTicks() const;
|
|
|
| @@ -440,8 +438,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| int id);
|
|
|
| // Virtual for testing.
|
| - virtual void AnimateLayers(base::TimeTicks monotonic_time,
|
| - base::Time wall_clock_time);
|
| + virtual void AnimateLayers(base::TimeTicks monotonic_time);
|
|
|
| // Virtual for testing.
|
| virtual base::TimeDelta LowFrequencyAnimationInterval() const;
|
| @@ -500,7 +497,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| void AnimateScrollbarsRecursive(LayerImpl* layer,
|
| base::TimeTicks time);
|
|
|
| - void UpdateCurrentFrameTime(base::TimeTicks* ticks, base::Time* now) const;
|
| + void UpdateCurrentFrameTime(base::TimeTicks* ticks) const;
|
|
|
| LayerImpl* FindScrollLayerForDeviceViewportPoint(
|
| const gfx::PointF& device_viewport_point,
|
| @@ -575,7 +572,7 @@ class CC_EXPORT LayerTreeHostImpl
|
|
|
| // This is set by AnimateLayers() and used by UpdateAnimationState()
|
| // when sending animation events to the main thread.
|
| - base::Time last_animation_time_;
|
| + base::TimeTicks last_animation_time_;
|
|
|
| scoped_ptr<TopControlsManager> top_controls_manager_;
|
|
|
| @@ -637,7 +634,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| gfx::Rect viewport_damage_rect_;
|
|
|
| base::TimeTicks current_frame_timeticks_;
|
| - base::Time current_frame_time_;
|
|
|
| scoped_ptr<AnimationRegistrar> animation_registrar_;
|
|
|
|
|