| 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 dec0e6c7f763f2e6a9675e35ab77e1656c5324ff..ac9944cf8c2c14f6b159fdf27389d2411fe078c2 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -115,8 +115,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| LayerScrollOffsetDelegate* root_layer_scroll_offset_delegate) OVERRIDE;
|
| virtual void OnRootLayerDelegatedScrollOffsetChanged() OVERRIDE;
|
| virtual void ScrollEnd() OVERRIDE;
|
| - virtual InputHandler::ScrollStatus FlingScrollBegin() OVERRIDE;
|
| - virtual void NotifyCurrentFlingVelocity(gfx::Vector2dF velocity) OVERRIDE;
|
| virtual void MouseMoveAt(gfx::Point viewport_point) OVERRIDE;
|
| virtual void PinchGestureBegin() OVERRIDE;
|
| virtual void PinchGestureUpdate(float magnify_delta,
|
| @@ -160,7 +158,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| virtual void Animate(base::TimeTicks monotonic_time,
|
| base::Time wall_clock_time);
|
| virtual void UpdateAnimationState(bool start_ready_animations);
|
| - void MainThreadHasStoppedFlinging();
|
| void UpdateBackgroundAnimateTicking(bool should_background_tick);
|
| void SetViewportDamage(gfx::Rect damage_rect);
|
|
|
| @@ -371,9 +368,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| gfx::Vector2dF accumulated_root_overscroll() const {
|
| return accumulated_root_overscroll_;
|
| }
|
| - gfx::Vector2dF current_fling_velocity() const {
|
| - return current_fling_velocity_;
|
| - }
|
|
|
| bool pinch_gesture_active() const { return pinch_gesture_active_; }
|
|
|
| @@ -543,7 +537,6 @@ class CC_EXPORT LayerTreeHostImpl
|
| ManagedMemoryPolicy cached_managed_memory_policy_;
|
|
|
| gfx::Vector2dF accumulated_root_overscroll_;
|
| - gfx::Vector2dF current_fling_velocity_;
|
|
|
| bool pinch_gesture_active_;
|
| bool pinch_gesture_end_should_clear_scrolling_layer_;
|
|
|