[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5c8b94fcf3e0d9a859beebbff731ee6c26b2f80c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 22:37:32 2009 +0000

    2009-10-05  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] EventSender::keyDown() cannot send function-key events.
            https://bugs.webkit.org/show_bug.cgi?id=30044
    
            This affects the fast/events/keydown-function-keys.html layout test.
    
            * DumpRenderTree/qt/jsobjects.cpp:
            (EventSender::keyDown):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 80e912b..171252b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-05  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] EventSender::keyDown() cannot send function-key events.
+        https://bugs.webkit.org/show_bug.cgi?id=30044
+
+        This affects the fast/events/keydown-function-keys.html layout test.
+
+        * DumpRenderTree/qt/jsobjects.cpp:
+        (EventSender::keyDown):
+
 2009-10-05  Vadim Zeitlin  <vadim at wxwidgets.org>
 
         Added --wx-compiler-prefix waf option to allow building wxWebKit with
diff --git a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
index fc1c35f..cd91e5a 100644
--- a/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
+++ b/WebKitTools/DumpRenderTree/qt/jsobjects.cpp
@@ -482,8 +482,14 @@ void EventSender::keyDown(const QString &string, const QStringList &modifiers)
             code = string.unicode()->toUpper().unicode();
     } else {
         qDebug() << ">>>>>>>>> keyDown" << string;
+
+        if (string.startsWith(QLatin1Char('F')) && string.count() <= 3) {
+            s = s.mid(1);
+            int functionKey = s.toInt();
+            Q_ASSERT(functionKey >= 1 && functionKey <= 35);
+            code = Qt::Key_F1 + (functionKey - 1);
         // map special keycode strings used by the tests to something that works for Qt/X11
-        if (string == QLatin1String("leftArrow")) {
+        } else if (string == QLatin1String("leftArrow")) {
             s = QString();
             code = Qt::Key_Left;
         } else if (string == QLatin1String("rightArrow")) {

-- 
WebKit Debian packaging