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

Side by Side Diff: content/browser/renderer_host/web_input_event_aura.cc

Issue 2120153003: Remove keyIdentifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_key_identifier_3a
Patch Set: Rebase Created 4 years, 5 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/web_input_event_aura.h" 5 #include "content/browser/renderer_host/web_input_event_aura.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "content/browser/renderer_host/input/web_input_event_util.h" 8 #include "content/browser/renderer_host/input/web_input_event_util.h"
9 #include "ui/aura/client/screen_position_client.h" 9 #include "ui/aura/client/screen_position_client.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 // Windows and X11 do and blink expects. 109 // Windows and X11 do and blink expects.
110 webkit_event.windowsKeyCode = 110 webkit_event.windowsKeyCode =
111 ui::NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code()); 111 ui::NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
112 webkit_event.nativeKeyCode = 112 webkit_event.nativeKeyCode =
113 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code()); 113 ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
114 webkit_event.domCode = static_cast<int>(event.code()); 114 webkit_event.domCode = static_cast<int>(event.code());
115 webkit_event.domKey = static_cast<int>(event.GetDomKey()); 115 webkit_event.domKey = static_cast<int>(event.GetDomKey());
116 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText(); 116 webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
117 webkit_event.text[0] = event.GetText(); 117 webkit_event.text[0] = event.GetText();
118 118
119 webkit_event.setKeyIdentifierFromWindowsKeyCode();
120
121 return webkit_event; 119 return webkit_event;
122 } 120 }
123 121
124 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( 122 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
125 const ui::ScrollEvent& event) { 123 const ui::ScrollEvent& event) {
126 blink::WebMouseWheelEvent webkit_event; 124 blink::WebMouseWheelEvent webkit_event;
127 125
128 webkit_event.type = blink::WebInputEvent::MouseWheel; 126 webkit_event.type = blink::WebInputEvent::MouseWheel;
129 webkit_event.button = blink::WebMouseEvent::ButtonNone; 127 webkit_event.button = blink::WebMouseEvent::ButtonNone;
130 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()); 128 webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 webkit_event.tiltX = roundf(event.pointer_details().tilt_x); 448 webkit_event.tiltX = roundf(event.pointer_details().tilt_x);
451 webkit_event.tiltY = roundf(event.pointer_details().tilt_y); 449 webkit_event.tiltY = roundf(event.pointer_details().tilt_y);
452 webkit_event.force = event.pointer_details().force; 450 webkit_event.force = event.pointer_details().force;
453 webkit_event.pointerType = 451 webkit_event.pointerType =
454 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type); 452 EventPointerTypeToWebPointerType(event.pointer_details().pointer_type);
455 453
456 return webkit_event; 454 return webkit_event;
457 } 455 }
458 456
459 } // namespace content 457 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/common/input/web_input_event_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698