diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-17 15:59:08 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-17 15:59:08 +0100 |
| commit | b98c772f6b9ef7a1eef75d3e678de67edfdde463 (patch) | |
| tree | e0c48faa792f25d9eeaeeb1ee9d1b722a1912f73 /WebCore | |
| parent | fcd645603bccba6947d87b3d4200fe124325162f (diff) | |
| download | external_webkit-b98c772f6b9ef7a1eef75d3e678de67edfdde463.zip external_webkit-b98c772f6b9ef7a1eef75d3e678de67edfdde463.tar.gz external_webkit-b98c772f6b9ef7a1eef75d3e678de67edfdde463.tar.bz2 | |
WebViewCore fix
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/PlatformKeyboardEvent.h | 3 | ||||
| -rw-r--r-- | WebCore/platform/android/KeyEventAndroid.cpp | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/WebCore/platform/PlatformKeyboardEvent.h b/WebCore/platform/PlatformKeyboardEvent.h index 248f399..1499ac5 100644 --- a/WebCore/platform/PlatformKeyboardEvent.h +++ b/WebCore/platform/PlatformKeyboardEvent.h @@ -140,7 +140,8 @@ namespace WebCore { #endif #if PLATFORM(ANDROID) - PlatformKeyboardEvent(int keyCode, UChar32 unichar, Type type, int repeatCount, ModifierKey modifier); + PlatformKeyboardEvent(int keyCode, UChar32 unichar, int repeatCount, + bool down, bool cap, bool alt, bool sym); UChar32 unichar() const { return m_unichar; } int repeatCount() const { return m_repeatCount; } #endif diff --git a/WebCore/platform/android/KeyEventAndroid.cpp b/WebCore/platform/android/KeyEventAndroid.cpp index ab848bd..998c781 100644 --- a/WebCore/platform/android/KeyEventAndroid.cpp +++ b/WebCore/platform/android/KeyEventAndroid.cpp @@ -211,9 +211,8 @@ static inline String singleCharacterString(UChar32 c) } PlatformKeyboardEvent::PlatformKeyboardEvent(int keyCode, UChar32 unichar, - Type type, int repeatCount, - ModifierKey mods) - : m_type(type) + int repeatCount, bool down, bool cap, bool alt, bool sym) + : m_type(down ? KeyDown : KeyUp) , m_text(singleCharacterString(unichar)) , m_unmodifiedText(singleCharacterString(unichar)) , m_keyIdentifier(keyIdentifierForAndroidKeyCode(keyCode)) @@ -221,10 +220,10 @@ PlatformKeyboardEvent::PlatformKeyboardEvent(int keyCode, UChar32 unichar, , m_windowsVirtualKeyCode(windowsKeyCodeForKeyEvent(keyCode)) , m_nativeVirtualKeyCode(keyCode) , m_isKeypad(false) - , m_shiftKey((mods & ShiftKey)) - , m_ctrlKey((mods & CtrlKey)) - , m_altKey((mods & AltKey)) - , m_metaKey((mods & MetaKey)) + , m_shiftKey(cap ? ShiftKey : 0) + , m_ctrlKey(sym ? CtrlKey : 0) + , m_altKey(alt ? AltKey : 0) + , m_metaKey(0) // added for android , m_repeatCount(repeatCount) , m_unichar(unichar) |