Switch KeyboardEvents over to NewEventHandler

sky/engine/public/platform/WebInputEvent.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 76 matching lines @@
 
         // WebPointerEvent
         PointerDown,
         PointerTypeFirst = PointerDown,
         PointerUp,
         PointerMove,
         PointerCancel,
         PointerTypeLast = PointerCancel,
 
         // WebKeyboardEvent
-        RawKeyDown,
-        KeyboardTypeFirst = RawKeyDown,
         KeyDown,
+        KeyboardTypeFirst = KeyDown,
         KeyUp,
         Char,
         KeyboardTypeLast = Char,
 
         // WebGestureEvent
         GestureScrollBegin,
         GestureTypeFirst = GestureScrollBegin,
         GestureScrollEnd,
         GestureScrollUpdate,
         GestureScrollUpdateWithoutPropagation,
@@ skipping 114 matching lines @@
     float orientation = 0;
     float tilt = 0;
 
     WebPointerEvent() : WebInputEvent(sizeof(WebPointerEvent)) {}
 };
 
 // WebKeyboardEvent -----------------------------------------------------------
 
 class WebKeyboardEvent : public WebInputEvent {
 public:
-    // Caps on string lengths so we can make them static arrays and keep
-    // them PODs.
-    static const size_t textLengthCap = 4;
-
-    // http://www.w3.org/TR/DOM-Level-3-Events/keyset.html lists the
-    // identifiers.  The longest is 18 characters, so we round up to the
-    // next multiple of 4.
-    static const size_t keyIdentifierLengthCap = 20;
-
-    // |windowsKeyCode| is the Windows key code associated with this key
+    // |key| is the Windows key code associated with this key
     // event.  Sometimes it's direct from the event (i.e. on Windows),
     // sometimes it's via a mapping function.  If you want a list, see
     // WebCore/platform/chromium/KeyboardCodes* . Note that this should
     // ALWAYS store the non-locational version of a keycode as this is
     // what is returned by the Windows API. For example, it should
     // store VK_SHIFT instead of VK_RSHIFT. The location information
     // should be stored in |modifiers|.
-    int windowsKeyCode;
+    int key;
 
-    // The actual key code genenerated by the platform.  The DOM spec runs
-    // on Windows-equivalent codes (thus |windowsKeyCode| above) but it
-    // doesn't hurt to have this one around.
-    int nativeKeyCode;
-
-    // This identifies whether this event was tagged by the system as being
-    // a "system key" event (see
-    // http://msdn.microsoft.com/en-us/library/ms646286(VS.85).aspx for
-    // details). Other platforms don't have this concept, but it's just
-    // easier to leave it always false than ifdef.
-    // See comment at the top of the file for why an int is used here.
-    bool isSystemKey;
-
-    // |text| is the text generated by this keystroke.  |unmodifiedText| is
-    // |text|, but unmodified by an concurrently-held modifiers (except
-    // shift).  This is useful for working out shortcut keys.  Linux and
-    // Windows guarantee one character per event.  The Mac does not, but in
-    // reality that's all it ever gives.  We're generous, and cap it a bit
-    // longer.
-    WebUChar text[textLengthCap];
-    WebUChar unmodifiedText[textLengthCap];
-
-    // This is a string identifying the key pressed.
-    char keyIdentifier[keyIdentifierLengthCap];
+    // |charCode| is the text generated by this keystroke.  |unmodifiedCharCode|
+    // is |charCode|, but unmodified by an concurrently-held modifiers (except
+    // shift).  This is useful for working out shortcut keys.
+    WebUChar charCode;
+    WebUChar unmodifiedCharCode;
 
     WebKeyboardEvent()
         : WebInputEvent(sizeof(WebKeyboardEvent))
-        , windowsKeyCode(0)
-        , nativeKeyCode(0)
-        , isSystemKey(false)
+        , key(0)
+        , charCode(0)
+        , unmodifiedCharCode(0)
     {
-        memset(&text, 0, sizeof(text));
-        memset(&unmodifiedText, 0, sizeof(unmodifiedText));
-        memset(&keyIdentifier, 0, sizeof(keyIdentifier));
     }
-
-    // Sets keyIdentifier based on the value of windowsKeyCode.  This is
-    // handy for generating synthetic keyboard events.
-    BLINK_EXPORT void setKeyIdentifierFromWindowsKeyCode();
-
-    static int windowsKeyCodeWithoutLocation(int keycode);
-    static int locationModifiersFromWindowsKeyCode(int keycode);
 };
 
 // WebGestureEvent --------------------------------------------------------------
 
 class WebGestureEvent : public WebInputEvent {
 public:
     int x;
     int y;
     int globalX;
     int globalY;
@@ skipping 61 matching lines @@
     {
         memset(&data, 0, sizeof(data));
     }
 };
 
 #pragma pack(pop)
 
 } // namespace blink
 
 #endif  // SKY_ENGINE_PUBLIC_PLATFORM_WEBINPUTEVENT_H_