From 7ef833ced4e3c2dee086078b4cec3fa2e15472e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Fri, 13 Jun 2014 14:38:54 +0200 Subject: 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 --- chromium/third_party/WebKit/Source/platform/PlatformKeyboardEvent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1