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 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
599 // HandleKeyboardEvent destroys this InputRouterImpl). | 599 // HandleKeyboardEvent destroys this InputRouterImpl). |
600 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. | 600 // TODO(jdduke): crbug.com/274029 - Make ack-triggered shutdown async. |
601 } | 601 } |
602 } | 602 } |
603 | 603 |
604 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, | 604 void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, |
605 InputEventAckState ack_result) { | 605 InputEventAckState ack_result) { |
606 if (type != WebInputEvent::MouseMove) | 606 if (type != WebInputEvent::MouseMove) |
607 return; | 607 return; |
608 | 608 |
| 609 DCHECK(mouse_move_pending_); |
609 mouse_move_pending_ = false; | 610 mouse_move_pending_ = false; |
610 | 611 |
611 if (next_mouse_move_) { | 612 if (next_mouse_move_) { |
612 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); | 613 DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); |
613 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move | 614 scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move |
614 = next_mouse_move_.Pass(); | 615 = next_mouse_move_.Pass(); |
615 SendMouseEvent(*next_mouse_move); | 616 SendMouseEvent(*next_mouse_move); |
616 } | 617 } |
617 } | 618 } |
618 | 619 |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( | 737 InputRouterImpl::QueuedWheelEvent::QueuedWheelEvent( |
737 const MouseWheelEventWithLatencyInfo& event, | 738 const MouseWheelEventWithLatencyInfo& event, |
738 bool synthesized_from_pinch) | 739 bool synthesized_from_pinch) |
739 : event(event), synthesized_from_pinch(synthesized_from_pinch) { | 740 : event(event), synthesized_from_pinch(synthesized_from_pinch) { |
740 } | 741 } |
741 | 742 |
742 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { | 743 InputRouterImpl::QueuedWheelEvent::~QueuedWheelEvent() { |
743 } | 744 } |
744 | 745 |
745 } // namespace content | 746 } // namespace content |
OLD | NEW |