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 <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "content/browser/renderer_host/input/gesture_event_queue.h" | 14 #include "content/browser/renderer_host/input/gesture_event_queue.h" |
15 #include "content/browser/renderer_host/input/input_ack_handler.h" | 15 #include "content/browser/renderer_host/input/input_ack_handler.h" |
16 #include "content/browser/renderer_host/input/input_router_client.h" | 16 #include "content/browser/renderer_host/input/input_router_client.h" |
17 #include "content/browser/renderer_host/input/touch_event_queue.h" | 17 #include "content/browser/renderer_host/input/touch_event_queue.h" |
18 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle
r.h" | 18 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle
r.h" |
19 #include "content/browser/renderer_host/input/web_input_event_util.h" | |
20 #include "content/common/content_constants_internal.h" | 19 #include "content/common/content_constants_internal.h" |
21 #include "content/common/edit_command.h" | 20 #include "content/common/edit_command.h" |
22 #include "content/common/input/input_event_ack_state.h" | 21 #include "content/common/input/input_event_ack_state.h" |
23 #include "content/common/input/touch_action.h" | 22 #include "content/common/input/touch_action.h" |
24 #include "content/common/input/web_touch_event_traits.h" | 23 #include "content/common/input/web_touch_event_traits.h" |
25 #include "content/common/input_messages.h" | 24 #include "content/common/input_messages.h" |
26 #include "content/common/view_messages.h" | 25 #include "content/common/view_messages.h" |
27 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
28 #include "content/public/browser/notification_types.h" | 27 #include "content/public/browser/notification_types.h" |
29 #include "content/public/browser/user_metrics.h" | 28 #include "content/public/browser/user_metrics.h" |
30 #include "content/public/common/content_switches.h" | 29 #include "content/public/common/content_switches.h" |
31 #include "ipc/ipc_sender.h" | 30 #include "ipc/ipc_sender.h" |
| 31 #include "ui/events/blink/blink_event_util.h" |
32 #include "ui/events/event.h" | 32 #include "ui/events/event.h" |
33 #include "ui/events/keycodes/keyboard_codes.h" | 33 #include "ui/events/keycodes/keyboard_codes.h" |
34 | 34 |
35 using base::Time; | 35 using base::Time; |
36 using base::TimeDelta; | 36 using base::TimeDelta; |
37 using base::TimeTicks; | 37 using base::TimeTicks; |
38 using blink::WebGestureEvent; | 38 using blink::WebGestureEvent; |
39 using blink::WebInputEvent; | 39 using blink::WebInputEvent; |
40 using blink::WebKeyboardEvent; | 40 using blink::WebKeyboardEvent; |
41 using blink::WebMouseEvent; | 41 using blink::WebMouseEvent; |
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
397 break; | 397 break; |
398 default: | 398 default: |
399 break; | 399 break; |
400 } | 400 } |
401 | 401 |
402 return consumed; | 402 return consumed; |
403 } | 403 } |
404 | 404 |
405 bool InputRouterImpl::OfferToRenderer(const WebInputEvent& input_event, | 405 bool InputRouterImpl::OfferToRenderer(const WebInputEvent& input_event, |
406 const ui::LatencyInfo& latency_info) { | 406 const ui::LatencyInfo& latency_info) { |
| 407 // This conversion is temporary. WebInputEvent should be generated |
| 408 // directly from ui::Event with the viewport coordinates. See |
| 409 // crbug.com/563730. |
407 scoped_ptr<blink::WebInputEvent> event_in_viewport = | 410 scoped_ptr<blink::WebInputEvent> event_in_viewport = |
408 ConvertWebInputEventToViewport(input_event, device_scale_factor_); | 411 ui::ScaleWebInputEvent(input_event, device_scale_factor_); |
409 const WebInputEvent* event_to_send = | 412 const WebInputEvent* event_to_send = |
410 event_in_viewport ? event_in_viewport.get() : &input_event; | 413 event_in_viewport ? event_in_viewport.get() : &input_event; |
411 | 414 |
412 if (Send(new InputMsg_HandleInputEvent(routing_id(), event_to_send, | 415 if (Send(new InputMsg_HandleInputEvent(routing_id(), event_to_send, |
413 latency_info))) { | 416 latency_info))) { |
414 // Ack messages for ignored ack event types should never be sent by the | 417 // Ack messages for ignored ack event types should never be sent by the |
415 // renderer. Consequently, such event types should not affect event time | 418 // renderer. Consequently, such event types should not affect event time |
416 // or in-flight event count metrics. | 419 // or in-flight event count metrics. |
417 if (WebInputEventTraits::WillReceiveAckFromRenderer(*event_to_send)) { | 420 if (WebInputEventTraits::WillReceiveAckFromRenderer(*event_to_send)) { |
418 input_event_start_time_ = TimeTicks::Now(); | 421 input_event_start_time_ = TimeTicks::Now(); |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
616 return; | 619 return; |
617 | 620 |
618 if (HasPendingEvents()) | 621 if (HasPendingEvents()) |
619 return; | 622 return; |
620 | 623 |
621 flush_requested_ = false; | 624 flush_requested_ = false; |
622 client_->DidFlush(); | 625 client_->DidFlush(); |
623 } | 626 } |
624 | 627 |
625 } // namespace content | 628 } // namespace content |
OLD | NEW |