Fixing WebKeyboardEvent. For reals this time.

webkit/tools/test_shell/event_sending_controller.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the definition for EventSendingController.
 //
 // Some notes about drag and drop handling:
 // Windows drag and drop goes through a system call to DoDragDrop.  At that
 // point, program control is given to Windows which then periodically makes
 // callbacks into the webview.  This won't work for layout tests, so instead,
@@ skipping 364 matching lines @@
       code = code_str[0];
       needs_shift_key_modifier = NeedsShiftModifer(code);
       generate_char = true;
     }
 
     // NOTE(jnd):For one keydown event, we need to generate
     // keyDown/keyUp pair, refer EventSender.cpp in
     // 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.key_code = code;
-#if defined(OS_LINUX)
+    event_down.windows_key_code = code;
+#if defined(OS_MAC) || 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;
+    event_down.text[0] = code;
 #endif
 
     if (args.size() >= 2 && (args[1].isObject() || args[1].isString()))
       ApplyKeyModifiers(&(args[1]), &event_down);
 
     if (needs_shift_key_modifier)
       event_down.modifiers |= WebInputEvent::SHIFT_KEY;
 
     event_up = event_down;
     event_up.type = WebInputEvent::KEY_UP;
@@ skipping 145 matching lines @@
 void EventSendingController::fireKeyboardEventsToElement(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void EventSendingController::clearKillRing(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }