diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-06-13 14:38:54 +0200 |
|---|---|---|
| committer | Michael Bruning <michael.bruning@digia.com> | 2014-06-13 16:07:16 +0200 |
| commit | 7ef833ced4e3c2dee086078b4cec3fa2e15472e5 (patch) | |
| tree | d2c54884fb1e49bc0c6944c6acc925d520eefdfd | |
| parent | 0a07797d0adb98633044038761f7bfdcd8a03a41 (diff) | |
| download | qtwebengine-chromium-7ef833ced4e3c2dee086078b4cec3fa2e15472e5.tar.gz | |
<third_party/WebKit> Fix key event crash on Windows.
This fixes the ASSERT that was triggerd on Windows in
PlatformKeyboardEvent::disambiguateKeyDownEvent because
we do our own conversion from native events to web events.
This is the same way it was handled in the Qt specific
PlatformKeyboardEvent in WebKit.
Change-Id: I177c238bde1e0101b6abe9d5bbe3ba2e47908f1a
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| -rw-r--r-- | chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp b/chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp index 1faa729c3f3..ba2da6c6923 100644 --- a/chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp +++ b/chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp @@ -43,7 +43,7 @@ static const unsigned short HIGHBITMASKSHORT = 0x8000; void PlatformKeyboardEvent::disambiguateKeyDownEvent(Type type) { -#if OS(WIN) +#if OS(WIN) && !defined(TOOLKIT_QT) // No KeyDown events on Windows to disambiguate. ASSERT_NOT_REACHED(); #else |