diff options
| author | Steve Block <steveblock@google.com> | 2010-04-28 17:56:59 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:13 +0100 |
| commit | 330bb52cdd4c0c38e2918b3da78420992dc09d55 (patch) | |
| tree | 3ef20e18bf2be27baa46b40144b178232e7b4b05 | |
| parent | 79768700a853c40c66ff0b0591957958667fdd9e (diff) | |
| download | external_webkit-330bb52cdd4c0c38e2918b3da78420992dc09d55.zip external_webkit-330bb52cdd4c0c38e2918b3da78420992dc09d55.tar.gz external_webkit-330bb52cdd4c0c38e2918b3da78420992dc09d55.tar.bz2 | |
Merge webkit.org at r58033 : Update location of KeyboardCodes.h
See http://trac.webkit.org/changeset/56704
Change-Id: I0091045727b5dcbbeebcd0d3839a220d8af176c7
| -rw-r--r-- | WebKit/android/WebCoreSupport/EditorClientAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp index c07ea71..718a30c 100644 --- a/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp +++ b/WebKit/android/WebCoreSupport/EditorClientAndroid.cpp @@ -32,12 +32,12 @@ #include "EventNames.h" #include "FocusController.h" #include "Frame.h" -#include "KeyboardCodes.h" #include "KeyboardEvent.h" #include "NotImplemented.h" #include "PlatformKeyboardEvent.h" #include "PlatformString.h" #include "WebViewCore.h" +#include "WindowsKeyboardCodes.h" namespace android { diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index bff45cb..f5768f4 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -67,7 +67,6 @@ #include "HistoryItem.h" #include "HitTestResult.h" #include "InlineTextBox.h" -#include "KeyboardCodes.h" #include "Navigator.h" #include "Node.h" #include "NodeList.h" @@ -101,6 +100,7 @@ #include "TypingCommand.h" #include "WebCoreFrameBridge.h" #include "WebFrameView.h" +#include "WindowsKeyboardCodes.h" #include "android_graphics.h" #include <JNIHelp.h> |