| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/events/blink/input_handler_proxy.h" | 5 #include "ui/events/blink/input_handler_proxy.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 | 10 |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 return scroll_begin_event; | 133 return scroll_begin_event; |
| 134 } | 134 } |
| 135 | 135 |
| 136 cc::ScrollState CreateScrollStateForGesture(const WebGestureEvent& event) { | 136 cc::ScrollState CreateScrollStateForGesture(const WebGestureEvent& event) { |
| 137 cc::ScrollStateData scroll_state_data; | 137 cc::ScrollStateData scroll_state_data; |
| 138 switch (event.type) { | 138 switch (event.type) { |
| 139 case WebInputEvent::GestureScrollBegin: | 139 case WebInputEvent::GestureScrollBegin: |
| 140 scroll_state_data.position_x = event.x; | 140 scroll_state_data.position_x = event.x; |
| 141 scroll_state_data.position_y = event.y; | 141 scroll_state_data.position_y = event.y; |
| 142 scroll_state_data.is_beginning = true; | 142 scroll_state_data.is_beginning = true; |
| 143 // On Mac, a GestureScrollBegin in the inertial phase indicates a fling |
| 144 // start. |
| 145 scroll_state_data.is_in_inertial_phase = |
| 146 (event.data.scrollBegin.inertialPhase == |
| 147 WebGestureEvent::MomentumPhase); |
| 143 break; | 148 break; |
| 144 case WebInputEvent::GestureFlingStart: | 149 case WebInputEvent::GestureFlingStart: |
| 145 scroll_state_data.velocity_x = event.data.flingStart.velocityX; | 150 scroll_state_data.velocity_x = event.data.flingStart.velocityX; |
| 146 scroll_state_data.velocity_y = event.data.flingStart.velocityY; | 151 scroll_state_data.velocity_y = event.data.flingStart.velocityY; |
| 147 scroll_state_data.is_in_inertial_phase = true; | 152 scroll_state_data.is_in_inertial_phase = true; |
| 148 break; | 153 break; |
| 149 case WebInputEvent::GestureScrollUpdate: | 154 case WebInputEvent::GestureScrollUpdate: |
| 150 scroll_state_data.delta_x = -event.data.scrollUpdate.deltaX; | 155 scroll_state_data.delta_x = -event.data.scrollUpdate.deltaX; |
| 151 scroll_state_data.delta_y = -event.data.scrollUpdate.deltaY; | 156 scroll_state_data.delta_y = -event.data.scrollUpdate.deltaY; |
| 152 scroll_state_data.velocity_x = event.data.scrollUpdate.velocityX; | 157 scroll_state_data.velocity_x = event.data.scrollUpdate.velocityX; |
| (...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 781 if (!gesture_scroll_on_impl_thread_ && !gesture_pinch_on_impl_thread_) | 786 if (!gesture_scroll_on_impl_thread_ && !gesture_pinch_on_impl_thread_) |
| 782 return DID_NOT_HANDLE; | 787 return DID_NOT_HANDLE; |
| 783 | 788 |
| 784 cc::ScrollState scroll_state = CreateScrollStateForGesture(gesture_event); | 789 cc::ScrollState scroll_state = CreateScrollStateForGesture(gesture_event); |
| 785 gfx::Point scroll_point(gesture_event.x, gesture_event.y); | 790 gfx::Point scroll_point(gesture_event.x, gesture_event.y); |
| 786 gfx::Vector2dF scroll_delta(-gesture_event.data.scrollUpdate.deltaX, | 791 gfx::Vector2dF scroll_delta(-gesture_event.data.scrollUpdate.deltaX, |
| 787 -gesture_event.data.scrollUpdate.deltaY); | 792 -gesture_event.data.scrollUpdate.deltaY); |
| 788 | 793 |
| 789 if (ShouldAnimate(gesture_event.data.scrollUpdate.deltaUnits != | 794 if (ShouldAnimate(gesture_event.data.scrollUpdate.deltaUnits != |
| 790 blink::WebGestureEvent::ScrollUnits::Pixels)) { | 795 blink::WebGestureEvent::ScrollUnits::Pixels)) { |
| 796 DCHECK(!scroll_state.is_in_inertial_phase()); |
| 791 base::TimeTicks event_time = | 797 base::TimeTicks event_time = |
| 792 base::TimeTicks() + | 798 base::TimeTicks() + |
| 793 base::TimeDelta::FromSecondsD(gesture_event.timeStampSeconds); | 799 base::TimeDelta::FromSecondsD(gesture_event.timeStampSeconds); |
| 794 base::TimeDelta delay = base::TimeTicks::Now() - event_time; | 800 base::TimeDelta delay = base::TimeTicks::Now() - event_time; |
| 795 switch (input_handler_->ScrollAnimated(scroll_point, scroll_delta, delay) | 801 switch (input_handler_->ScrollAnimated(scroll_point, scroll_delta, delay) |
| 796 .thread) { | 802 .thread) { |
| 797 case cc::InputHandler::SCROLL_ON_IMPL_THREAD: | 803 case cc::InputHandler::SCROLL_ON_IMPL_THREAD: |
| 798 return DID_HANDLE; | 804 return DID_HANDLE; |
| 799 case cc::InputHandler::SCROLL_IGNORED: | 805 case cc::InputHandler::SCROLL_IGNORED: |
| 800 return DROP_EVENT; | 806 return DROP_EVENT; |
| (...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1533 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, | 1539 scroll_elasticity_controller_->GetWeakPtr(), gesture_event, |
| 1534 scroll_result)); | 1540 scroll_result)); |
| 1535 } | 1541 } |
| 1536 | 1542 |
| 1537 void InputHandlerProxy::SetTickClockForTesting( | 1543 void InputHandlerProxy::SetTickClockForTesting( |
| 1538 std::unique_ptr<base::TickClock> tick_clock) { | 1544 std::unique_ptr<base::TickClock> tick_clock) { |
| 1539 tick_clock_ = std::move(tick_clock); | 1545 tick_clock_ = std::move(tick_clock); |
| 1540 } | 1546 } |
| 1541 | 1547 |
| 1542 } // namespace ui | 1548 } // namespace ui |
| OLD | NEW |