summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/event_sending_controller.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 15:36:37 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-26 15:36:37 +0000
commit6d850f189679e9e60e8ef3135c037915f10cd6a9 (patch)
tree3b0c8ba2c5672c15880ff774b6d368877e4d8b3f /webkit/tools/test_shell/event_sending_controller.cc
parentb8e1f95cf888bba24fe3ef1d357474f23091235d (diff)
downloadchromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.zip
chromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.tar.gz
chromium_src-6d850f189679e9e60e8ef3135c037915f10cd6a9.tar.bz2
Reverting key change (again); this breaks every keyboard layout test there is. Will fix and recommit.
Review URL: http://codereview.chromium.org/28186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/event_sending_controller.cc')
-rw-r--r--webkit/tools/test_shell/event_sending_controller.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 6409433..76e8a06 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -382,20 +382,16 @@ void EventSendingController::keyDown(
// WebKit/WebKitTools/DumpRenderTree/win. We may also need
// to generate a keyChar event in certain cases.
WebKeyboardEvent event_down, event_up;
-#if defined(OS_WIN)
- event_down.type = WebInputEvent::RAW_KEY_DOWN;
-#else
event_down.type = WebInputEvent::KEY_DOWN;
-#endif
event_down.modifiers = 0;
- event_down.windows_key_code = code;
-#if defined(OS_MAC) || defined(OS_LINUX)
+ event_down.key_code = code;
+#if defined(OS_LINUX)
// TODO(deanm): This code is a confusing mix of different platform key
// codes. Since we're not working with a GDK event, we can't use our
// GDK -> WebKit converter, which means the Linux specific extra |text|
// field goes uninitialized. I don't know how to correctly calculate this
// field, but for now we will at least initialize it, even if it's wrong.
- event_down.text[0] = code;
+ event_down.text = code;
#endif
if (args.size() >= 2 && (args[1].isObject() || args[1].isString()))