| Index: ui/events/blink/input_scroll_elasticity_controller.cc
|
| diff --git a/ui/events/blink/input_scroll_elasticity_controller.cc b/ui/events/blink/input_scroll_elasticity_controller.cc
|
| index a64f27da0a866a118b2afaec99318769a9496c3f..744c1bcf24745f661ed5d26eaa272852bf7cfd0f 100644
|
| --- a/ui/events/blink/input_scroll_elasticity_controller.cc
|
| +++ b/ui/events/blink/input_scroll_elasticity_controller.cc
|
| @@ -106,67 +106,6 @@ InputScrollElasticityController::GetWeakPtr() {
|
| return base::WeakPtr<InputScrollElasticityController>();
|
| }
|
|
|
| -void InputScrollElasticityController::ObserveWheelEventAndResult(
|
| - const blink::WebMouseWheelEvent& wheel_event,
|
| - const cc::InputHandlerScrollResult& scroll_result) {
|
| - // We should only get PhaseMayBegin or PhaseBegan events while in the
|
| - // Inactive or MomentumAnimated states, but in case we get bad input (e.g,
|
| - // abbreviated by tab-switch), always re-set the state to ActiveScrolling
|
| - // when those events are received.
|
| - if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseMayBegin ||
|
| - wheel_event.phase == blink::WebMouseWheelEvent::PhaseBegan) {
|
| - scroll_velocity = gfx::Vector2dF();
|
| - last_scroll_event_timestamp_ = base::TimeTicks();
|
| - state_ = kStateActiveScroll;
|
| - pending_overscroll_delta_ = gfx::Vector2dF();
|
| - return;
|
| - }
|
| -
|
| - gfx::Vector2dF event_delta(-wheel_event.deltaX, -wheel_event.deltaY);
|
| - base::TimeTicks event_timestamp =
|
| - base::TimeTicks() +
|
| - base::TimeDelta::FromSecondsD(wheel_event.timeStampSeconds);
|
| - switch (state_) {
|
| - case kStateInactive: {
|
| - // The PhaseMayBegin and PhaseBegan cases are handled at the top of the
|
| - // function.
|
| - if (wheel_event.momentumPhase == blink::WebMouseWheelEvent::PhaseBegan)
|
| - state_ = kStateMomentumScroll;
|
| - break;
|
| - }
|
| - case kStateActiveScroll:
|
| - if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseChanged) {
|
| - UpdateVelocity(event_delta, event_timestamp);
|
| - Overscroll(event_delta, scroll_result.unused_scroll_delta);
|
| - } else if (wheel_event.phase == blink::WebMouseWheelEvent::PhaseEnded ||
|
| - wheel_event.phase ==
|
| - blink::WebMouseWheelEvent::PhaseCancelled) {
|
| - if (helper_->StretchAmount().IsZero()) {
|
| - EnterStateInactive();
|
| - } else {
|
| - EnterStateMomentumAnimated(event_timestamp);
|
| - }
|
| - }
|
| - break;
|
| - case kStateMomentumScroll:
|
| - if (wheel_event.momentumPhase ==
|
| - blink::WebMouseWheelEvent::PhaseChanged) {
|
| - UpdateVelocity(event_delta, event_timestamp);
|
| - Overscroll(event_delta, scroll_result.unused_scroll_delta);
|
| - if (!helper_->StretchAmount().IsZero()) {
|
| - EnterStateMomentumAnimated(event_timestamp);
|
| - }
|
| - } else if (wheel_event.momentumPhase ==
|
| - blink::WebMouseWheelEvent::PhaseEnded) {
|
| - EnterStateInactive();
|
| - }
|
| - case kStateMomentumAnimated:
|
| - // The PhaseMayBegin and PhaseBegan cases are handled at the top of the
|
| - // function.
|
| - break;
|
| - }
|
| -}
|
| -
|
| void InputScrollElasticityController::ObserveGestureEventAndResult(
|
| const blink::WebGestureEvent& gesture_event,
|
| const cc::InputHandlerScrollResult& scroll_result) {
|
|
|