diff options
author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 08:43:25 +0000 |
---|---|---|
committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-08 08:43:25 +0000 |
commit | 1a3c040badb5142fff527d35de4810a599610e71 (patch) | |
tree | d1b74a6e13f4eede2329e9c4cb3167ba8fdf6402 /webkit | |
parent | 325fefd82050008ce6fc573927c2f12a202e6664 (diff) | |
download | chromium_src-1a3c040badb5142fff527d35de4810a599610e71.zip chromium_src-1a3c040badb5142fff527d35de4810a599610e71.tar.gz chromium_src-1a3c040badb5142fff527d35de4810a599610e71.tar.bz2 |
Initialize the Linux specific text event code field in the event sending controller.
Review URL: http://codereview.chromium.org/13239
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/test_shell/event_sending_controller.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc index da1b662..24aff94 100644 --- a/webkit/tools/test_shell/event_sending_controller.cc +++ b/webkit/tools/test_shell/event_sending_controller.cc @@ -377,8 +377,7 @@ int EventSendingController::GetButtonNumberFromSingleArg( code = kKeyCodeUp; } else if (L"delete" == code_str) { code = kKeyCodeDelete; - } - else { + } else { DCHECK(code_str.length() == 1); code = code_str[0]; needs_shift_key_modifier = NeedsShiftModifer(code); @@ -393,6 +392,14 @@ int EventSendingController::GetButtonNumberFromSingleArg( event_down.type = WebInputEvent::KEY_DOWN; event_down.modifiers = 0; 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 = code; +#endif if (args.size() >= 2 && (args[1].isObject() || args[1].isString())) ApplyKeyModifiers(&(args[1]), &event_down); |