Fixing WebKeyboardEvent.

webkit/tools/test_shell/keyboard_unittest.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.
 
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
 #include "EventTarget.h"
 #include "KeyboardCodes.h"
 #include "KeyboardEvent.h"
 MSVC_POP_WARNING();
 
 #undef LOG
 
+#include "base/string_util.h"
 #include "webkit/glue/editor_client_impl.h"
 #include "webkit/glue/event_conversion.h"
 #include "webkit/glue/webinputevent.h"
+#include "webkit/glue/webinputevent_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using WebCore::PlatformKeyboardEvent;
 using WebCore::KeyboardEvent;
 
 class KeyboardTest : public testing::Test {
  public:
   void SetUp() {
     WTF::initializeThreading();
   }
 
   // Pass a WebKeyboardEvent into the EditorClient and get back the string
   // name of which editing event that key causes.
   // E.g., sending in the enter key gives back "InsertNewline".
   const char* InterpretKeyEvent(
       const WebKeyboardEvent& keyboard_event,
       PlatformKeyboardEvent::Type key_type) {
     EditorClientImpl editor_impl(NULL);
 
     MakePlatformKeyboardEvent evt(keyboard_event);
     evt.SetKeyType(key_type);
     RefPtr<KeyboardEvent> keyboardEvent = KeyboardEvent::create(evt, NULL);
     return editor_impl.interpretKeyEvent(keyboardEvent.get());
   }
 
   // Set up a WebKeyboardEvent KEY_DOWN event with key code and modifiers.
   void SetupKeyDownEvent(WebKeyboardEvent* keyboard_event,
                          char key_code,
                          int modifiers) {
-    keyboard_event->key_code = key_code;
+    keyboard_event->windows_key_code = key_code;
     keyboard_event->modifiers = modifiers;
     keyboard_event->type = WebInputEvent::KEY_DOWN;
-#if defined(OS_LINUX)
-    keyboard_event->text = key_code;
-#elif defined(OS_MACOSX)
-    keyboard_event->text.clear();
-    keyboard_event->text.push_back(key_code);
-#endif
+    keyboard_event->text[0] = key_code;
+    std::string key_identifier_str =
+        webkit_glue::GetKeyIdentifierForWindowsKeyCode(key_code);
+    base::strlcpy(keyboard_event->key_identifier, key_identifier_str.c_str(),
+                  kIdentifierLengthCap);
   }
 
   // Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|.
   // OSModifier is the platform's standard modifier key: control on most
   // platforms, but meta (command) on Mac.
   const char* InterpretOSModifierKeyPress(char key_code) {
     WebKeyboardEvent keyboard_event;
 #if defined(OS_WIN) || defined(OS_LINUX)
     WebInputEvent::Modifiers os_modifier = WebInputEvent::CTRL_KEY;
 #elif defined(OS_MACOSX)
@@ skipping 87 matching lines @@
 
 TEST_F(KeyboardTest, TestInsertNewline3) {
   EXPECT_STREQ("InsertNewline", InterpretNewLine(WebInputEvent::ALT_KEY));
 }
 
 TEST_F(KeyboardTest, TestInsertNewline4) {
   int modifiers = WebInputEvent::ALT_KEY | WebInputEvent::SHIFT_KEY;
   const char* result = InterpretNewLine(modifiers);
   EXPECT_STREQ("InsertNewline", result);
 }