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

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

Issue 1147843003: Set WebKeyboardEvent.domCode on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add test Created 5 years, 7 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
« no previous file with comments | « no previous file | content/browser/renderer_host/web_input_event_aura_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "content/browser/renderer_host/input/web_input_event_util.h" 7 #include "content/browser/renderer_host/input/web_input_event_util.h"
8 #include "content/browser/renderer_host/ui_events_helper.h" 8 #include "content/browser/renderer_host/ui_events_helper.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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) { 266 blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
267 // Windows can figure out whether or not to construct a RawKeyDown or a Char 267 // Windows can figure out whether or not to construct a RawKeyDown or a Char
268 // WebInputEvent based on the type of message carried in 268 // WebInputEvent based on the type of message carried in
269 // event.native_event(). X11 is not so fortunate, there is no separate 269 // event.native_event(). X11 is not so fortunate, there is no separate
270 // translated event type, so DesktopHostLinux sends an extra KeyEvent with 270 // translated event type, so DesktopHostLinux sends an extra KeyEvent with
271 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function 271 // is_char() == true. We need to pass the ui::KeyEvent to the X11 function
272 // to detect this case so the right event type can be constructed. 272 // to detect this case so the right event type can be constructed.
273 #if defined(OS_WIN) 273 #if defined(OS_WIN)
274 if (event.HasNativeEvent()) { 274 if (event.HasNativeEvent()) {
275 // Key events require no translation by the aura system. 275 // Key events require no translation by the aura system.
276 return MakeWebKeyboardEventFromNativeEvent(event.native_event()); 276 blink::WebKeyboardEvent webkit_event(
277 MakeWebKeyboardEventFromNativeEvent(event.native_event()));
278 webkit_event.domCode = static_cast<int>(event.code());
279 return webkit_event;
277 } 280 }
278 #endif 281 #endif
279 return MakeWebKeyboardEventFromAuraEvent(event); 282 return MakeWebKeyboardEventFromAuraEvent(event);
280 } 283 }
281 284
282 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) { 285 blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) {
283 blink::WebGestureEvent gesture_event; 286 blink::WebGestureEvent gesture_event;
284 #if defined(OS_WIN) 287 #if defined(OS_WIN)
285 if (event.HasNativeEvent()) 288 if (event.HasNativeEvent())
286 gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event()); 289 gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event());
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 webkit_event.deltaY = event.y_offset(); 395 webkit_event.deltaY = event.y_offset();
393 } 396 }
394 397
395 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick; 398 webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
396 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick; 399 webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
397 400
398 return webkit_event; 401 return webkit_event;
399 } 402 }
400 403
401 } // namespace content 404 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/web_input_event_aura_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698