Fix event generation for layout tests. Key codes are 'A'..'Z' so we must ensure that the values used are they.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/582023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38620 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 4 deletions

diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 2ecd6a8..fa8da24 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -542,10 +542,11 @@ void EventSendingController::keyDown(
     // Convert \n -> VK_RETURN.  Some layout tests use \n to mean "Enter", when
     // Windows uses \r for "Enter".
     int code = 0;
+    int text = 0;
     bool needs_shift_key_modifier = false;
     if (L"\n" == code_str) {
       generate_char = true;
-      code = base::VKEY_RETURN;
+      text = code = base::VKEY_RETURN;
     } else if (L"rightArrow" == code_str) {
       code = base::VKEY_RIGHT;
     } else if (L"downArrow" == code_str) {
@@ -579,8 +580,10 @@ void EventSendingController::keyDown(
       }
       if (!code) {
         DCHECK(code_str.length() == 1);
-        code = code_str[0];
+        text = code = code_str[0];
         needs_shift_key_modifier = NeedsShiftModifier(code);
+        if ((code & 0xFF) >= 'a' && (code & 0xFF) <= 'z')
+          code -= 'a' - 'A';
         generate_char = true;
       }
     }
@@ -595,8 +598,8 @@ void EventSendingController::keyDown(
     event_down.modifiers = 0;
     event_down.windowsKeyCode = code;
     if (generate_char) {
-      event_down.text[0] = code;
-      event_down.unmodifiedText[0] = code;
+      event_down.text[0] = text;
+      event_down.unmodifiedText[0] = text;
     }
     event_down.setKeyIdentifierFromWindowsKeyCode();