Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(538)

Side by Side Diff: content/browser/renderer_host/input/input_router_impl.cc

Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and ncarter's review Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <utility> 9 #include <utility>
10 10
11 #include "base/auto_reset.h" 11 #include "base/auto_reset.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "content/browser/renderer_host/input/gesture_event_queue.h" 16 #include "content/browser/renderer_host/input/gesture_event_queue.h"
17 #include "content/browser/renderer_host/input/input_ack_handler.h" 17 #include "content/browser/renderer_host/input/input_ack_handler.h"
18 #include "content/browser/renderer_host/input/input_router_client.h" 18 #include "content/browser/renderer_host/input/input_router_client.h"
19 #include "content/browser/renderer_host/input/touch_event_queue.h" 19 #include "content/browser/renderer_host/input/touch_event_queue.h"
20 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h" 20 #include "content/browser/renderer_host/input/touchpad_tap_suppression_controlle r.h"
21 #include "content/common/content_constants_internal.h" 21 #include "content/common/content_constants_internal.h"
22 #include "content/common/edit_command.h" 22 #include "content/common/edit_command.h"
23 #include "content/common/input/input_event_ack_state.h" 23 #include "content/common/input/input_event_ack_state.h"
24 #include "content/common/input/touch_action.h" 24 #include "content/common/input/touch_action.h"
25 #include "content/common/input/web_input_event_traits.h"
26 #include "content/common/input/web_touch_event_traits.h" 25 #include "content/common/input/web_touch_event_traits.h"
27 #include "content/common/input_messages.h" 26 #include "content/common/input_messages.h"
28 #include "content/common/view_messages.h" 27 #include "content/common/view_messages.h"
29 #include "content/public/browser/notification_service.h" 28 #include "content/public/browser/notification_service.h"
30 #include "content/public/browser/notification_types.h" 29 #include "content/public/browser/notification_types.h"
31 #include "content/public/browser/user_metrics.h" 30 #include "content/public/browser/user_metrics.h"
32 #include "content/public/common/content_features.h" 31 #include "content/public/common/content_features.h"
33 #include "content/public/common/content_switches.h" 32 #include "content/public/common/content_switches.h"
34 #include "ipc/ipc_sender.h" 33 #include "ipc/ipc_sender.h"
35 #include "ui/events/blink/blink_event_util.h" 34 #include "ui/events/blink/blink_event_util.h"
35 #include "ui/events/blink/web_input_event_traits.h"
36 #include "ui/events/event.h" 36 #include "ui/events/event.h"
37 #include "ui/events/keycodes/keyboard_codes.h" 37 #include "ui/events/keycodes/keyboard_codes.h"
38 38
39 using base::Time; 39 using base::Time;
40 using base::TimeDelta; 40 using base::TimeDelta;
41 using base::TimeTicks; 41 using base::TimeTicks;
42 using blink::WebGestureEvent; 42 using blink::WebGestureEvent;
43 using blink::WebInputEvent; 43 using blink::WebInputEvent;
44 using blink::WebKeyboardEvent; 44 using blink::WebKeyboardEvent;
45 using blink::WebMouseEvent; 45 using blink::WebMouseEvent;
46 using blink::WebMouseWheelEvent; 46 using blink::WebMouseWheelEvent;
47 using blink::WebTouchEvent; 47 using blink::WebTouchEvent;
48 using ui::WebInputEventTraits;
48 49
49 namespace content { 50 namespace content {
50 namespace { 51 namespace {
51 52
52 const char* GetEventAckName(InputEventAckState ack_result) { 53 const char* GetEventAckName(InputEventAckState ack_result) {
53 switch(ack_result) { 54 switch(ack_result) {
54 case INPUT_EVENT_ACK_STATE_UNKNOWN: return "UNKNOWN"; 55 case INPUT_EVENT_ACK_STATE_UNKNOWN: return "UNKNOWN";
55 case INPUT_EVENT_ACK_STATE_CONSUMED: return "CONSUMED"; 56 case INPUT_EVENT_ACK_STATE_CONSUMED: return "CONSUMED";
56 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: return "NOT_CONSUMED"; 57 case INPUT_EVENT_ACK_STATE_NOT_CONSUMED: return "NOT_CONSUMED";
57 case INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS: return "NO_CONSUMER_EXISTS"; 58 case INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS: return "NO_CONSUMER_EXISTS";
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 636
636 flush_requested_ = false; 637 flush_requested_ = false;
637 client_->DidFlush(); 638 client_->DidFlush();
638 } 639 }
639 640
640 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) { 641 void InputRouterImpl::SetFrameTreeNodeId(int frameTreeNodeId) {
641 frame_tree_node_id_ = frameTreeNodeId; 642 frame_tree_node_id_ = frameTreeNodeId;
642 } 643 }
643 644
644 } // namespace content 645 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698