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

Side by Side Diff: ui/events/blink/web_input_event.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits Created 3 years, 11 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "ui/events/blink/web_input_event.h" 5 #include "ui/events/blink/web_input_event.h"
6 6
7 #include "ui/events/base_event_utils.h" 7 #include "ui/events/base_event_utils.h"
8 #include "ui/events/blink/blink_event_util.h" 8 #include "ui/events/blink/blink_event_util.h"
9 #include "ui/events/blink/blink_features.h" 9 #include "ui/events/blink/blink_features.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 break; 102 break;
103 default: 103 default:
104 NOTREACHED(); 104 NOTREACHED();
105 } 105 }
106 106
107 blink::WebKeyboardEvent webkit_event( 107 blink::WebKeyboardEvent webkit_event(
108 type, EventFlagsToWebEventModifiers(event.flags()) | 108 type, EventFlagsToWebEventModifiers(event.flags()) |
109 DomCodeToWebInputEventModifiers(event.code()), 109 DomCodeToWebInputEventModifiers(event.code()),
110 EventTimeStampToSeconds(event.time_stamp())); 110 EventTimeStampToSeconds(event.time_stamp()));
111 111
112 if (webkit_event.modifiers & blink::WebInputEvent::AltKey) 112 if (webkit_event.modifiers() & blink::WebInputEvent::AltKey)
113 webkit_event.isSystemKey = true; 113 webkit_event.isSystemKey = true;
114 114
115 // TODO(dtapuska): crbug.com/570388. Ozone appears to deliver 115 // TODO(dtapuska): crbug.com/570388. Ozone appears to deliver
116 // key_code events that aren't "located" for the keypad like 116 // key_code events that aren't "located" for the keypad like
117 // Windows and X11 do and blink expects. 117 // Windows and X11 do and blink expects.
118 webkit_event.windowsKeyCode = 118 webkit_event.windowsKeyCode =
119 NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code()); 119 NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
120 webkit_event.nativeKeyCode = 120 webkit_event.nativeKeyCode =
121 KeycodeConverter::DomCodeToNativeKeycode(event.code()); 121 KeycodeConverter::DomCodeToNativeKeycode(event.code());
122 webkit_event.domCode = static_cast<int>(event.code()); 122 webkit_event.domCode = static_cast<int>(event.code());
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 // WebInputEvent based on the type of message carried in 314 // WebInputEvent based on the type of message carried in
315 // event.native_event(). X11 is not so fortunate, there is no separate 315 // event.native_event(). X11 is not so fortunate, there is no separate
316 // translated event type, so DesktopHostLinux sends an extra KeyEvent with 316 // translated event type, so DesktopHostLinux sends an extra KeyEvent with
317 // is_char() == true. We need to pass the KeyEvent to the X11 function 317 // is_char() == true. We need to pass the KeyEvent to the X11 function
318 // to detect this case so the right event type can be constructed. 318 // to detect this case so the right event type can be constructed.
319 #if defined(OS_WIN) 319 #if defined(OS_WIN)
320 if (event.HasNativeEvent()) { 320 if (event.HasNativeEvent()) {
321 // Key events require no translation. 321 // Key events require no translation.
322 blink::WebKeyboardEvent webkit_event(MakeWebKeyboardEventFromNativeEvent( 322 blink::WebKeyboardEvent webkit_event(MakeWebKeyboardEventFromNativeEvent(
323 event.native_event(), event.time_stamp())); 323 event.native_event(), event.time_stamp()));
324 webkit_event.modifiers |= DomCodeToWebInputEventModifiers(event.code()); 324 webkit_event.setModifiers(webkit_event.modifiers() |
325 DomCodeToWebInputEventModifiers(event.code()));
325 webkit_event.domCode = static_cast<int>(event.code()); 326 webkit_event.domCode = static_cast<int>(event.code());
326 webkit_event.domKey = static_cast<int>(event.GetDomKey()); 327 webkit_event.domKey = static_cast<int>(event.GetDomKey());
327 return webkit_event; 328 return webkit_event;
328 } 329 }
329 #endif 330 #endif
330 return MakeWebKeyboardEventFromUiEvent(event); 331 return MakeWebKeyboardEventFromUiEvent(event);
331 } 332 }
332 333
333 blink::WebGestureEvent MakeWebGestureEvent( 334 blink::WebGestureEvent MakeWebGestureEvent(
334 const GestureEvent& event, 335 const GestureEvent& event,
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 451 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
451 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 452 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
452 webkit_event.force = event.pointer_details().force; 453 webkit_event.force = event.pointer_details().force;
453 webkit_event.pointerType = 454 webkit_event.pointerType =
454 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 455 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
455 456
456 return webkit_event; 457 return webkit_event;
457 } 458 }
458 459
459 } // namespace ui 460 } // namespace ui
OLDNEW
« no previous file with comments | « ui/events/blink/input_scroll_elasticity_controller.cc ('k') | ui/events/blink/web_input_event_builders_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698