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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 // HandleKeyboardEvent destroys this InputRouterImpl). | 609 // HandleKeyboardEvent destroys this InputRouterImpl). |
610 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. | 610 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. |
611 } | 611 } |
612 } | 612 } |
613 | 613 |
614 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, | 614 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, |
615 InputEventAckState ack_result) { | 615 InputEventAckState ack_result) { |
616 if (type != WebInputEvent::MouseMove) | 616 if (type != WebInputEvent::MouseMove) |
617 return; | 617 return; |
618 | 618 |
| 619 DCHECK(mouse_move_pending_); |
619 mouse_move_pending_ = false; | 620 mouse_move_pending_ = false; |
620 | 621 |
621 if (next_mouse_move_) { | 622 if (next_mouse_move_) { |
622 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); | 623 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); |
623 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move | 624 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move |
624 = next_mouse_move_.Pass(); | 625 = next_mouse_move_.Pass(); |
625 SendMouseEvent(*next_mouse_move); | 626 SendMouseEvent(*next_mouse_move); |
626 } | 627 } |
627 } | 628 } |
628 | 629 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
746 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( | 747 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( |
747 const MouseWheelEventWithLatencyInfo& event, | 748 const MouseWheelEventWithLatencyInfo& event, |
748 bool synthesized_from_pinch) | 749 bool synthesized_from_pinch) |
749 : event(event), synthesized_from_pinch(synthesized_from_pinch) { | 750 : event(event), synthesized_from_pinch(synthesized_from_pinch) { |
750 } | 751 } |
751 | 752 |
752 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { | 753 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { |
753 } | 754 } |
754 | 755 |
755 } // namespace content | 756 } // namespace content |
OLD | NEW |