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 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
603 // HandleKeyboardEvent destroys this InputRouterImpl). | 603 // HandleKeyboardEvent destroys this InputRouterImpl). |
604 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. | 604 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. |
605 } | 605 } |
606 } | 606 } |
607 | 607 |
608 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, | 608 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, |
609 InputEventAckState ack_result) { | 609 InputEventAckState ack_result) { |
610 if (type != WebInputEvent::MouseMove) | 610 if (type != WebInputEvent::MouseMove) |
611 return; | 611 return; |
612 | 612 |
| 613 DCHECK(mouse_move_pending_); |
613 mouse_move_pending_ = false; | 614 mouse_move_pending_ = false; |
614 | 615 |
615 if (next_mouse_move_) { | 616 if (next_mouse_move_) { |
616 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); | 617 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); |
617 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move | 618 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move |
618 = next_mouse_move_.Pass(); | 619 = next_mouse_move_.Pass(); |
619 SendMouseEvent(*next_mouse_move); | 620 SendMouseEvent(*next_mouse_move); |
620 } | 621 } |
621 } | 622 } |
622 | 623 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
740 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( | 741 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( |
741 const MouseWheelEventWithLatencyInfo& event, | 742 const MouseWheelEventWithLatencyInfo& event, |
742 bool synthesized_from_pinch) | 743 bool synthesized_from_pinch) |
743 : event(event), synthesized_from_pinch(synthesized_from_pinch) { | 744 : event(event), synthesized_from_pinch(synthesized_from_pinch) { |
744 } | 745 } |
745 | 746 |
746 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { | 747 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { |
747 } | 748 } |
748 | 749 |
749 } // namespace content | 750 } // namespace content |
OLD | NEW |