[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[robert at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 4f6f8d5d6691252de77321409cbc2948f257e510
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 16 21:08:28 2011 +0000

    2011-01-16  Robert Hogan  <robert at 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 at 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
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5326ff6..54cf792 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-16  Robert Hogan  <robert at 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 at apple.com>
 
         Skip fast/dom/Range/range-clone-contents.html on Windows
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 0c3986f..6c92bae 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5319,10 +5319,6 @@ http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html
 http/tests/security/aboutBlank/xss-DENIED-navigate-opener-javascript-url.html
 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
 editing/selection/click-left-of-rtl-wrapping-text.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 38141c0..240424d 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-16  Robert Hogan  <robert at 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 at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
index fdbe552..6cf36e9 100644
--- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
@@ -417,15 +417,14 @@ void setXKeyEventSpecificFields(XEvent* xEvent, KeyboardEvent* event)
     xEvent->xkey.keycode = keyEvent->nativeScanCode();
 
     // 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()));
     }
 
     xEvent->xkey.same_screen = true;

-- 
WebKit Debian packaging