Chrome-side of using setKeyIdentifierFromWindowsKeyCode instead of

KeyIdentifier.h.

BUG=9460
R=avi,dglazkov

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

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

5 files changed, 8 insertions, 27 deletions

diff --git a/webkit/build/WebKit/SConscript b/webkit/build/WebKit/SConscript
index 41ef3ed..fe82687 100644
--- a/webkit/build/WebKit/SConscript
+++ b/webkit/build/WebKit/SConscript
@@ -22,10 +22,10 @@ input_files = [
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumBridge.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumCurrentTime.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumThreading.cpp',
-  '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/KeyIdentifier.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCache.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCString.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebImageSkia.cpp',
+  '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebInputEvent.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebKit.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebString.cpp',
   '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebURL.cpp',
diff --git a/webkit/build/WebKit/WebKit.vcproj b/webkit/build/WebKit/WebKit.vcproj
index 87aee8d..216bdbf 100644
--- a/webkit/build/WebKit/WebKit.vcproj
+++ b/webkit/build/WebKit/WebKit.vcproj
@@ -220,14 +220,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\KeyIdentifier.cpp"
-					>
-				</File>
-				<File
-					RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\KeyIdentifier.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebCache.cpp"
 					>
 				</File>
@@ -240,6 +232,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebInputEvent.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebKit.cpp"
 					>
 				</File>
diff --git a/webkit/tools/test_shell/event_sending_controller.cc b/webkit/tools/test_shell/event_sending_controller.cc
index cded2e6..d0849ba 100644
--- a/webkit/tools/test_shell/event_sending_controller.cc
+++ b/webkit/tools/test_shell/event_sending_controller.cc
@@ -32,11 +32,6 @@
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/test_shell.h"
 
-// TODO(darin): This is a temporary hack.  The better solution is to defer
-// generation of the keyIdentifier to the point where a PlatformKeyboardEvent
-// is created from our WebKeyboardEvent.
-#include "third_party/WebKit/WebKit/chromium/src/KeyIdentifier.h"
-
 #if defined(OS_WIN)
 #include "third_party/WebKit/WebKit/chromium/public/win/WebInputEventFactory.h"
 using WebKit::WebInputEventFactory;
@@ -408,10 +403,7 @@ void EventSendingController::keyDown(
       event_down.text[0] = code;
       event_down.unmodifiedText[0] = code;
     }
-
-    // TODO(darin): remove this temporary hack.
-    WebKit::keyIdentifierForWindowsKeyCode(
-        code, event_down.keyIdentifier, sizeof(event_down.keyIdentifier));
+    event_down.setKeyIdentifierFromWindowsKeyCode();
 
     if (args.size() >= 2 && (args[1].isObject() || args[1].isString()))
       ApplyKeyModifiers(&(args[1]), &event_down);
diff --git a/webkit/tools/test_shell/keyboard_unittest.cc b/webkit/tools/test_shell/keyboard_unittest.cc
index 5786612..713739b 100644
--- a/webkit/tools/test_shell/keyboard_unittest.cc
+++ b/webkit/tools/test_shell/keyboard_unittest.cc
@@ -19,7 +19,6 @@ MSVC_POP_WARNING();
 #include "webkit/glue/event_conversion.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
-#include "third_party/WebKit/WebKit/chromium/src/KeyIdentifier.h"  // TODO(darin): TEMPORARY HACK
 
 using WebCore::PlatformKeyboardEvent;
 using WebCore::KeyboardEvent;
@@ -55,12 +54,7 @@ class KeyboardTest : public testing::Test {
     keyboard_event->modifiers = modifiers;
     keyboard_event->type = WebInputEvent::KeyDown;
     keyboard_event->text[0] = key_code;
-
-    // TODO(darin): remove this temporary hack.
-    WebKit::keyIdentifierForWindowsKeyCode(
-        key_code,
-        keyboard_event->keyIdentifier,
-        sizeof(keyboard_event->keyIdentifier));
+    keyboard_event->setKeyIdentifierFromWindowsKeyCode();
   }
 
   // Like InterpretKeyEvent, but with pressing down OSModifier+|key_code|.
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index f32686d..c9c8207 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4117,11 +4117,10 @@
         '../third_party/WebKit/WebKit/chromium/src/ChromiumBridge.cpp',
         '../third_party/WebKit/WebKit/chromium/src/ChromiumCurrentTime.cpp',
         '../third_party/WebKit/WebKit/chromium/src/ChromiumThreading.cpp',
-        '../third_party/WebKit/WebKit/chromium/src/KeyIdentifier.cpp',
-        '../third_party/WebKit/WebKit/chromium/src/KeyIdentifier.h',
         '../third_party/WebKit/WebKit/chromium/src/WebCache.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebCString.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
+        '../third_party/WebKit/WebKit/chromium/src/WebInputEvent.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebKit.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebString.cpp',
         '../third_party/WebKit/WebKit/chromium/src/WebURL.cpp',