Chromium Code Reviews| 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/immediate_input_router.h" | 5 #include "content/browser/renderer_host/input/immediate_input_router.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "content/browser/renderer_host/input/gesture_event_filter.h" | 9 #include "content/browser/renderer_host/input/gesture_event_filter.h" |
| 10 #include "content/browser/renderer_host/input/input_ack_handler.h" | 10 #include "content/browser/renderer_host/input/input_ack_handler.h" |
| (...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 478 = next_mouse_move_.Pass(); | 478 = next_mouse_move_.Pass(); |
| 479 SendMouseEvent(*next_mouse_move); | 479 SendMouseEvent(*next_mouse_move); |
| 480 } | 480 } |
| 481 } else if (WebInputEvent::isKeyboardEventType(type)) { | 481 } else if (WebInputEvent::isKeyboardEventType(type)) { |
| 482 ProcessKeyboardAck(type, ack_result); | 482 ProcessKeyboardAck(type, ack_result); |
| 483 } else if (type == WebInputEvent::MouseWheel) { | 483 } else if (type == WebInputEvent::MouseWheel) { |
| 484 ProcessWheelAck(ack_result); | 484 ProcessWheelAck(ack_result); |
| 485 } else if (WebInputEvent::isTouchEventType(type)) { | 485 } else if (WebInputEvent::isTouchEventType(type)) { |
| 486 ProcessTouchAck(ack_result, latency_info); | 486 ProcessTouchAck(ack_result, latency_info); |
| 487 } else if (WebInputEvent::isGestureEventType(type)) { | 487 } else if (WebInputEvent::isGestureEventType(type)) { |
| 488 ProcessGestureAck(type, ack_result); | 488 ProcessGestureAck(event_type, ack_result); |
| 489 } | 489 } |
| 490 | 490 |
| 491 // WARNING: |this| may be deleted at this point. | 491 // WARNING: |this| may be deleted at this point. |
| 492 | 492 |
| 493 // This is used only for testing, and the other end does not use the | 493 // This is used only for testing, and the other end does not use the |
| 494 // source object. On linux, specifying | 494 // source object. On linux, specifying |
| 495 // Source<RenderWidgetHost> results in a very strange | 495 // Source<RenderWidgetHost> results in a very strange |
| 496 // runtime error in the epilogue of the enclosing | 496 // runtime error in the epilogue of the enclosing |
| 497 // (ProcessInputEventAck) method, but not on other platforms; using | 497 // (ProcessInputEventAck) method, but not on other platforms; using |
| 498 // 'void' instead is just as safe (since NotificationSource | 498 // 'void' instead is just as safe (since NotificationSource |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 534 | 534 |
| 535 // Now send the next (coalesced) mouse wheel event. | 535 // Now send the next (coalesced) mouse wheel event. |
| 536 if (!coalesced_mouse_wheel_events_.empty()) { | 536 if (!coalesced_mouse_wheel_events_.empty()) { |
| 537 MouseWheelEventWithLatencyInfo next_wheel_event = | 537 MouseWheelEventWithLatencyInfo next_wheel_event = |
| 538 coalesced_mouse_wheel_events_.front(); | 538 coalesced_mouse_wheel_events_.front(); |
| 539 coalesced_mouse_wheel_events_.pop_front(); | 539 coalesced_mouse_wheel_events_.pop_front(); |
| 540 SendWheelEvent(next_wheel_event); | 540 SendWheelEvent(next_wheel_event); |
| 541 } | 541 } |
| 542 } | 542 } |
| 543 | 543 |
| 544 void ImmediateInputRouter::ProcessGestureAck(int type, | 544 void ImmediateInputRouter::ProcessGestureAck(WebInputEvent::Type type, |
| 545 InputEventAckState ack_result) { | 545 InputEventAckState ack_result) { |
| 546 if (GestureEventFilter::IsGestureEventTypeAsync(type)) | |
| 547 return; | |
|
jdduke (slow)
2013/10/01 17:16:15
As we discussed, please add a comment here indicat
tdresser
2013/10/01 17:54:36
Done.
| |
| 546 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); | 548 const bool processed = (INPUT_EVENT_ACK_STATE_CONSUMED == ack_result); |
| 547 ack_handler_->OnGestureEventAck( | 549 ack_handler_->OnGestureEventAck( |
| 548 gesture_event_filter_->GetGestureEventAwaitingAck(), ack_result); | 550 gesture_event_filter_->GetGestureEventAwaitingAck(), ack_result); |
| 549 gesture_event_filter_->ProcessGestureAck(processed, type); | 551 gesture_event_filter_->ProcessGestureAck(processed, type); |
| 550 } | 552 } |
| 551 | 553 |
| 552 void ImmediateInputRouter::ProcessTouchAck( | 554 void ImmediateInputRouter::ProcessTouchAck( |
| 553 InputEventAckState ack_result, | 555 InputEventAckState ack_result, |
| 554 const ui::LatencyInfo& latency_info) { | 556 const ui::LatencyInfo& latency_info) { |
| 555 // |touch_event_queue_| will forward to OnTouchEventAck when appropriate. | 557 // |touch_event_queue_| will forward to OnTouchEventAck when appropriate. |
| 556 touch_event_queue_->ProcessTouchAck(ack_result, latency_info); | 558 touch_event_queue_->ProcessTouchAck(ack_result, latency_info); |
| 557 } | 559 } |
| 558 | 560 |
| 559 void ImmediateInputRouter::HandleGestureScroll( | 561 void ImmediateInputRouter::HandleGestureScroll( |
| 560 const GestureEventWithLatencyInfo& gesture_event) { | 562 const GestureEventWithLatencyInfo& gesture_event) { |
| 561 if (!enable_no_touch_to_renderer_while_scrolling_) | 563 if (!enable_no_touch_to_renderer_while_scrolling_) |
| 562 return; | 564 return; |
| 563 | 565 |
| 564 // Once scrolling is started stop forwarding touch move events to renderer. | 566 // Once scrolling is started stop forwarding touch move events to renderer. |
| 565 if (gesture_event.event.type == WebInputEvent::GestureScrollBegin) | 567 if (gesture_event.event.type == WebInputEvent::GestureScrollBegin) |
| 566 touch_event_queue_->set_no_touch_move_to_renderer(true); | 568 touch_event_queue_->set_no_touch_move_to_renderer(true); |
| 567 | 569 |
| 568 if (gesture_event.event.type == WebInputEvent::GestureScrollEnd || | 570 if (gesture_event.event.type == WebInputEvent::GestureScrollEnd || |
| 569 gesture_event.event.type == WebInputEvent::GestureFlingStart) { | 571 gesture_event.event.type == WebInputEvent::GestureFlingStart) { |
| 570 touch_event_queue_->set_no_touch_move_to_renderer(false); | 572 touch_event_queue_->set_no_touch_move_to_renderer(false); |
| 571 } | 573 } |
| 572 } | 574 } |
| 573 | 575 |
| 574 } // namespace content | 576 } // namespace content |
| OLD | NEW |