| 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 "content/browser/renderer_host/input/input_router_impl.h" | 5 #include "content/browser/renderer_host/input/input_router_impl.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 279 touch_event_.ReleasePoint(index); | 279 touch_event_.ReleasePoint(index); |
| 280 } | 280 } |
| 281 | 281 |
| 282 void CancelTouchPoint(int index) { | 282 void CancelTouchPoint(int index) { |
| 283 touch_event_.CancelPoint(index); | 283 touch_event_.CancelPoint(index); |
| 284 } | 284 } |
| 285 | 285 |
| 286 void SendInputEventACK(blink::WebInputEvent::Type type, | 286 void SendInputEventACK(blink::WebInputEvent::Type type, |
| 287 InputEventAckState ack_result) { | 287 InputEventAckState ack_result) { |
| 288 DCHECK(!WebInputEvent::isTouchEventType(type)); | 288 DCHECK(!WebInputEvent::isTouchEventType(type)); |
| 289 InputEventAck ack(type, ack_result); | 289 InputEventAck ack(InputEventAckSource::COMPOSITOR_THREAD, type, ack_result); |
| 290 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); | 290 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); |
| 291 } | 291 } |
| 292 | 292 |
| 293 void SendTouchEventACK(blink::WebInputEvent::Type type, | 293 void SendTouchEventACK(blink::WebInputEvent::Type type, |
| 294 InputEventAckState ack_result, | 294 InputEventAckState ack_result, |
| 295 uint32_t touch_event_id) { | 295 uint32_t touch_event_id) { |
| 296 DCHECK(WebInputEvent::isTouchEventType(type)); | 296 DCHECK(WebInputEvent::isTouchEventType(type)); |
| 297 InputEventAck ack(type, ack_result, touch_event_id); | 297 InputEventAck ack(InputEventAckSource::COMPOSITOR_THREAD, type, ack_result, |
| 298 touch_event_id); |
| 298 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); | 299 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); |
| 299 } | 300 } |
| 300 | 301 |
| 301 InputRouterImpl* input_router() const { | 302 InputRouterImpl* input_router() const { |
| 302 return input_router_.get(); | 303 return input_router_.get(); |
| 303 } | 304 } |
| 304 | 305 |
| 305 bool TouchEventQueueEmpty() const { | 306 bool TouchEventQueueEmpty() const { |
| 306 return input_router()->touch_event_queue_.empty(); | 307 return input_router()->touch_event_queue_.empty(); |
| 307 } | 308 } |
| (...skipping 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1808 client_overscroll.latest_overscroll_delta); | 1809 client_overscroll.latest_overscroll_delta); |
| 1809 EXPECT_EQ(overscroll.current_fling_velocity, | 1810 EXPECT_EQ(overscroll.current_fling_velocity, |
| 1810 client_overscroll.current_fling_velocity); | 1811 client_overscroll.current_fling_velocity); |
| 1811 | 1812 |
| 1812 DidOverscrollParams wheel_overscroll; | 1813 DidOverscrollParams wheel_overscroll; |
| 1813 wheel_overscroll.accumulated_overscroll = gfx::Vector2dF(7, -7); | 1814 wheel_overscroll.accumulated_overscroll = gfx::Vector2dF(7, -7); |
| 1814 wheel_overscroll.latest_overscroll_delta = gfx::Vector2dF(3, 0); | 1815 wheel_overscroll.latest_overscroll_delta = gfx::Vector2dF(3, 0); |
| 1815 wheel_overscroll.current_fling_velocity = gfx::Vector2dF(1, 0); | 1816 wheel_overscroll.current_fling_velocity = gfx::Vector2dF(1, 0); |
| 1816 | 1817 |
| 1817 SimulateWheelEvent(0, 0, 3, 0, 0, false); | 1818 SimulateWheelEvent(0, 0, 3, 0, 0, false); |
| 1818 InputEventAck ack(WebInputEvent::MouseWheel, | 1819 InputEventAck ack(InputEventAckSource::COMPOSITOR_THREAD, |
| 1820 WebInputEvent::MouseWheel, |
| 1819 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); | 1821 INPUT_EVENT_ACK_STATE_NOT_CONSUMED); |
| 1820 ack.overscroll.reset(new DidOverscrollParams(wheel_overscroll)); | 1822 ack.overscroll.reset(new DidOverscrollParams(wheel_overscroll)); |
| 1821 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); | 1823 input_router_->OnMessageReceived(InputHostMsg_HandleInputEvent_ACK(0, ack)); |
| 1822 | 1824 |
| 1823 client_overscroll = client_->GetAndResetOverscroll(); | 1825 client_overscroll = client_->GetAndResetOverscroll(); |
| 1824 EXPECT_EQ(wheel_overscroll.accumulated_overscroll, | 1826 EXPECT_EQ(wheel_overscroll.accumulated_overscroll, |
| 1825 client_overscroll.accumulated_overscroll); | 1827 client_overscroll.accumulated_overscroll); |
| 1826 EXPECT_EQ(wheel_overscroll.latest_overscroll_delta, | 1828 EXPECT_EQ(wheel_overscroll.latest_overscroll_delta, |
| 1827 client_overscroll.latest_overscroll_delta); | 1829 client_overscroll.latest_overscroll_delta); |
| 1828 EXPECT_EQ(wheel_overscroll.current_fling_velocity, | 1830 EXPECT_EQ(wheel_overscroll.current_fling_velocity, |
| (...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2279 EXPECT_EQ(80, sent_event->data.flingStart.velocityY); | 2281 EXPECT_EQ(80, sent_event->data.flingStart.velocityY); |
| 2280 | 2282 |
| 2281 const WebGestureEvent* filter_event = | 2283 const WebGestureEvent* filter_event = |
| 2282 GetFilterWebInputEvent<WebGestureEvent>(); | 2284 GetFilterWebInputEvent<WebGestureEvent>(); |
| 2283 TestLocationInFilterEvent(filter_event, orig); | 2285 TestLocationInFilterEvent(filter_event, orig); |
| 2284 EXPECT_EQ(30, filter_event->data.flingStart.velocityX); | 2286 EXPECT_EQ(30, filter_event->data.flingStart.velocityX); |
| 2285 EXPECT_EQ(40, filter_event->data.flingStart.velocityY); | 2287 EXPECT_EQ(40, filter_event->data.flingStart.velocityY); |
| 2286 } | 2288 } |
| 2287 | 2289 |
| 2288 } // namespace content | 2290 } // namespace content |
| OLD | NEW |