Changeset 75894 in webkit

Timestamp:

Jan 16, 2011 1:08:28 PM (13 years ago)

Author:

robert@webkit.org

Message:

2011-01-16 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] plugins/keyboard-events.html fails after r72717
​https://bugs.webkit.org/show_bug.cgi?id=50050

• platform/qt/Skipped: Unskip plugins/keyboard-events.html

2011-01-16 Robert Hogan <​robert@webkit.org>

Reviewed by Andreas Kling.

[Qt] plugins/keyboard-events.html fails after r72717
​https://bugs.webkit.org/show_bug.cgi?id=50050

• plugins/qt/PluginViewQt.cpp: (WebCore::setXKeyEventSpecificFields): map event text to keycode

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/plugins/qt/PluginViewQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-01-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] plugins/keyboard-events.html fails after r72717
+        https://bugs.webkit.org/show_bug.cgi?id=50050
+
+        * platform/qt/Skipped: Unskip plugins/keyboard-events.html
+
 2011-01-15  David Kilzer  <ddkilzer@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -5320 +5320 @@
 http/tests/security/aboutBlank/xss-DENIED-set-opener.html
 
-# [Qt] plugins/keyboard-events.html fails after r72717
-# https://bugs.webkit.org/show_bug.cgi?id=50050
-plugins/keyboard-events.html
-
 # REGRESSION(r72861): editing/selection/click-left-of-rtl-wrapping-text.html and modify-up-on-rtl-wrapping-text.html fail on all but Mac platform
 # https://bugs.webkit.org/show_bug.cgi?id=50204

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] plugins/keyboard-events.html fails after r72717
+        https://bugs.webkit.org/show_bug.cgi?id=50050
+
+        * plugins/qt/PluginViewQt.cpp:
+        (WebCore::setXKeyEventSpecificFields): map event text to keycode
+
 2011-01-16  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/plugins/qt/PluginViewQt.cpp

@@ -418 +418 @@
 
     // We may not have a nativeScanCode() if the key event is from DRT's eventsender. In that
-    // case just populate the XEvent's keycode with the Qt platform-independent keycode. The only
+    // case fetch the XEvent's keycode from the event's text. The only
     // place this keycode will be used is in webkit_test_plugin_handle_event().
+    // FIXME: Create Qt API so that we can set the appropriate keycode in DRT EventSender instead.
     if (QWebPagePrivate::drtRun && !xEvent->xkey.keycode) {
         QKeyEvent* qKeyEvent = keyEvent->qtEvent();
         ASSERT(qKeyEvent);
-        if (!qKeyEvent->text().isEmpty())
-            xEvent->xkey.keycode = int(qKeyEvent->text().at(0).unicode() + qKeyEvent->modifiers());
-        else if (qKeyEvent->key() && (qKeyEvent->key() != Qt::Key_unknown))
-            xEvent->xkey.keycode = int(qKeyEvent->key() + qKeyEvent->modifiers());
+        QString keyText = qKeyEvent->text().left(1);
+        xEvent->xkey.keycode = XKeysymToKeycode(QX11Info::display(), XStringToKeysym(keyText.toUtf8().constData()));
     }