Remove WebKeyboardEvent::key_data because we don't actually use it

anymore.  This makes WebKeyboardEvent easier to port to other
platforms.
Review URL: http://codereview.chromium.org/8026

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

6 files changed, 3 insertions, 18 deletions

diff --git a/webkit/glue/webinputevent.h b/webkit/glue/webinputevent.h
index 07e2cab..e6f119c 100644
--- a/webkit/glue/webinputevent.h
+++ b/webkit/glue/webinputevent.h
@@ -115,15 +115,13 @@ class WebMouseWheelEvent : public WebMouseEvent {
 class WebKeyboardEvent : public WebInputEvent {
  public:
   int key_code;
-  int key_data;
 #if defined(OS_WIN)
   bool system_key;  // Set if we receive a SYSKEYDOWN/WM_SYSKEYUP message.
   MSG actual_message; // Set to the current keyboard message.
 #endif
 
   WebKeyboardEvent() 
-      : key_code(0),
-        key_data(0)
+      : key_code(0)
 #if defined(OS_WIN)
         , system_key(false) {
     memset(&actual_message, 0, sizeof(actual_message));
diff --git a/webkit/glue/webinputevent_mac.mm b/webkit/glue/webinputevent_mac.mm
index 363c25f..0355bcc 100644
--- a/webkit/glue/webinputevent_mac.mm
+++ b/webkit/glue/webinputevent_mac.mm
@@ -160,7 +160,6 @@ WebKeyboardEvent::WebKeyboardEvent(NSEvent *event) {
     modifiers |= IS_AUTO_REPEAT;
 
   key_code = [event keyCode];
-  key_data = [[event characters] characterAtIndex:0];
   
   mac_event = event;  // retains |event|
 }
diff --git a/webkit/glue/webinputevent_win.cc b/webkit/glue/webinputevent_win.cc
index 93f5da7..6ca6292 100644
--- a/webkit/glue/webinputevent_win.cc
+++ b/webkit/glue/webinputevent_win.cc
@@ -262,7 +262,6 @@ WebKeyboardEvent::WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam,
   actual_message.lParam = lparam;
 
   key_code = static_cast<int>(wparam);
-  key_data = static_cast<int>(lparam);
 
   switch (message) {
     case WM_SYSKEYDOWN:
@@ -276,7 +275,6 @@ WebKeyboardEvent::WebKeyboardEvent(HWND hwnd, UINT message, WPARAM wparam,
       type = KEY_UP;
       break;
     case WM_IME_CHAR:
-      key_data = static_cast<int>(wparam);
       type = CHAR;
       break;
     case WM_SYSCHAR:
diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc
index d4b7e23..a5149c3 100644
--- a/webkit/glue/webview_impl.cc
+++ b/webkit/glue/webview_impl.cc
@@ -1014,10 +1014,8 @@ void WebViewImpl::SetInitialFocus(bool reverse) {
     keyboard_event.type = WebInputEvent::KEY_DOWN;
     if (reverse)
       keyboard_event.modifiers = WebInputEvent::SHIFT_KEY;
-#if defined(OS_WIN)
-    keyboard_event.key_code = VK_TAB;
-#endif
-    keyboard_event.key_data = L'\t';
+    // VK_TAB which is only defined on Windows.
+    keyboard_event.key_code = 0x09;
     MakePlatformKeyboardEvent platform_event(keyboard_event);
     // We have to set the key type explicitly to avoid an assert in the
     // KeyboardEvent constructor.
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index 7164e7f..7df89e1 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -405,7 +405,6 @@ int EventSendingController::GetButtonNumberFromSingleArg(
     event_down.type = WebInputEvent::KEY_DOWN;
     event_down.modifiers = 0;
     event_down.key_code = code;
-    event_down.key_data = code;
 
     if (args.size() >= 2 && args[1].isObject())
       ApplyKeyModifiers(&(args[1]), &event_down);
@@ -434,30 +433,24 @@ int EventSendingController::GetButtonNumberFromSingleArg(
         switch(code) {
           case '5':
             event_char.key_code = kPercentVirtualKeyCode;
-            event_char.key_data = kPercentVirtualKeyCode;
             break;
           case '7':
             event_char.key_code = kAmpersandVirtualKeyCode;
-            event_char.key_data = kAmpersandVirtualKeyCode;
             break;
           case '9':
             event_char.key_code = kLeftParenthesesVirtualKeyCode;
-            event_char.key_data = kLeftParenthesesVirtualKeyCode;
             break;
           case '0':
             event_char.key_code = kRightParenthesesVirtualKeyCode;
-            event_char.key_data = kRightParenthesesVirtualKeyCode;
             break;
 #if defined(OS_WIN)
           //  '[{' for US
           case VK_OEM_4:
             event_char.key_code = kLeftCurlyBracketVirtualKeyCode;
-            event_char.key_data = kLeftCurlyBracketVirtualKeyCode;
             break;
           //  ']}' for US
           case VK_OEM_6:
             event_char.key_code = kRightCurlyBracketVirtualKeyCode;
-            event_char.key_data = kRightCurlyBracketVirtualKeyCode;
             break;
 #endif
           default:
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc
index bc6bca8..dd540f8 100644
--- a/webkit/tools/test_shell/keyboard_unittest.cc
+++ b/webkit/tools/test_shell/keyboard_unittest.cc
@@ -34,7 +34,6 @@ static inline void SetupKeyDownEvent(WebKeyboardEvent& keyboard_event,
                                      char key_code,
                                      int modifiers) {
   keyboard_event.key_code = key_code;
-  keyboard_event.key_data = key_code;
   keyboard_event.modifiers = modifiers;
   keyboard_event.type = WebInputEvent::KEY_DOWN;
 }