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

Side by Side Diff: content/renderer/render_view_browsertest.cc

Issue 954943003: [KeyboardEvent] Use DOM |code| rather than Windows-based key code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added missing VKEY in windows for brightness and power Created 5 years, 10 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 | ui/base/accelerators/accelerator.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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/memory/shared_memory.h" 8 #include "base/memory/shared_memory.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 ui::KeyEvent event1(xevent); 213 ui::KeyEvent event1(xevent);
214 NativeWebKeyboardEvent keydown_event(event1); 214 NativeWebKeyboardEvent keydown_event(event1);
215 SendNativeKeyEvent(keydown_event); 215 SendNativeKeyEvent(keydown_event);
216 216
217 // X11 doesn't actually have native character events, but give the test 217 // X11 doesn't actually have native character events, but give the test
218 // what it wants. 218 // what it wants.
219 xevent.InitKeyEvent(ui::ET_KEY_PRESSED, 219 xevent.InitKeyEvent(ui::ET_KEY_PRESSED,
220 static_cast<ui::KeyboardCode>(key_code), 220 static_cast<ui::KeyboardCode>(key_code),
221 flags); 221 flags);
222 ui::KeyEvent event2(xevent); 222 ui::KeyEvent event2(xevent);
223 event2.set_character(GetCharacterFromKeyCode(event2.key_code(), 223 event2.set_character(DomCodeToCharacter(event2.code(), event2.flags()));
224 event2.flags()));
225 ui::KeyEventTestApi test_event2(&event2); 224 ui::KeyEventTestApi test_event2(&event2);
226 test_event2.set_is_char(true); 225 test_event2.set_is_char(true);
227 NativeWebKeyboardEvent char_event(event2); 226 NativeWebKeyboardEvent char_event(event2);
228 SendNativeKeyEvent(char_event); 227 SendNativeKeyEvent(char_event);
229 228
230 xevent.InitKeyEvent(ui::ET_KEY_RELEASED, 229 xevent.InitKeyEvent(ui::ET_KEY_RELEASED,
231 static_cast<ui::KeyboardCode>(key_code), 230 static_cast<ui::KeyboardCode>(key_code),
232 flags); 231 flags);
233 ui::KeyEvent event3(xevent); 232 ui::KeyEvent event3(xevent);
234 NativeWebKeyboardEvent keyup_event(event3); 233 NativeWebKeyboardEvent keyup_event(event3);
235 SendNativeKeyEvent(keyup_event); 234 SendNativeKeyEvent(keyup_event);
236 235
237 long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code), 236 ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
238 flags); 237 ui::DomCode code = KeyboardCodeToDomCode(keycode);
238 long c = DomCodeToCharacter(code, flags);
239 output->assign(1, static_cast<base::char16>(c)); 239 output->assign(1, static_cast<base::char16>(c));
240 return 1; 240 return 1;
241 #elif defined(USE_OZONE) 241 #elif defined(USE_OZONE)
242 const int flags = ConvertMockKeyboardModifier(modifiers); 242 const int flags = ConvertMockKeyboardModifier(modifiers);
243 243
244 ui::KeyEvent keydown_event(ui::ET_KEY_PRESSED, 244 ui::KeyEvent keydown_event(ui::ET_KEY_PRESSED,
245 static_cast<ui::KeyboardCode>(key_code), 245 static_cast<ui::KeyboardCode>(key_code),
246 flags); 246 flags);
247 NativeWebKeyboardEvent keydown_web_event(keydown_event); 247 NativeWebKeyboardEvent keydown_web_event(keydown_event);
248 SendNativeKeyEvent(keydown_web_event); 248 SendNativeKeyEvent(keydown_web_event);
249 249
250 ui::KeyEvent char_event(keydown_event.GetCharacter(), 250 ui::KeyEvent char_event(keydown_event.GetCharacter(),
251 static_cast<ui::KeyboardCode>(key_code), 251 static_cast<ui::KeyboardCode>(key_code),
252 flags); 252 flags);
253 NativeWebKeyboardEvent char_web_event(char_event); 253 NativeWebKeyboardEvent char_web_event(char_event);
254 SendNativeKeyEvent(char_web_event); 254 SendNativeKeyEvent(char_web_event);
255 255
256 ui::KeyEvent keyup_event(ui::ET_KEY_RELEASED, 256 ui::KeyEvent keyup_event(ui::ET_KEY_RELEASED,
257 static_cast<ui::KeyboardCode>(key_code), 257 static_cast<ui::KeyboardCode>(key_code),
258 flags); 258 flags);
259 NativeWebKeyboardEvent keyup_web_event(keyup_event); 259 NativeWebKeyboardEvent keyup_web_event(keyup_event);
260 SendNativeKeyEvent(keyup_web_event); 260 SendNativeKeyEvent(keyup_web_event);
261 261
262 long c = GetCharacterFromKeyCode(static_cast<ui::KeyboardCode>(key_code), 262 ui::KeyboardCode keycode = static_cast<ui::KeyboardCode>(key_code);
263 flags); 263 ui::DomCode code = KeyboardCodeToDomCode(keycode);
264 long c = DomCodeToCharacter(code, flags);
264 output->assign(1, static_cast<base::char16>(c)); 265 output->assign(1, static_cast<base::char16>(c));
265 return 1; 266 return 1;
266 #else 267 #else
267 NOTIMPLEMENTED(); 268 NOTIMPLEMENTED();
268 return L'\0'; 269 return L'\0';
269 #endif 270 #endif
270 } 271 }
271 272
272 void EnablePreferredSizeMode() { 273 void EnablePreferredSizeMode() {
273 view()->OnEnablePreferredSizeChangedMode(); 274 view()->OnEnablePreferredSizeChangedMode();
(...skipping 2038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2312 2313
2313 gfx::Size size = GetPreferredSize(); 2314 gfx::Size size = GetPreferredSize();
2314 EXPECT_EQ(gfx::Size(400, 400), size); 2315 EXPECT_EQ(gfx::Size(400, 400), size);
2315 2316
2316 SetZoomLevel(ZoomFactorToZoomLevel(2.0)); 2317 SetZoomLevel(ZoomFactorToZoomLevel(2.0));
2317 size = GetPreferredSize(); 2318 size = GetPreferredSize();
2318 EXPECT_EQ(gfx::Size(800, 800), size); 2319 EXPECT_EQ(gfx::Size(800, 800), size);
2319 } 2320 }
2320 2321
2321 } // namespace content 2322 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | ui/base/accelerators/accelerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698