[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 530f570cacea930d358acce0e1fd87779567baa6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 8 18:51:22 2009 +0000

    2009-11-08  Shu Chang  <Chang.Shu at nokia.com>
    
            Reviewed by Holger Freyther.
    
            [Qt] Added support for key code 8 (backspace) in EventSenderQt.
            This helps to pass the test case below. Also replaced hardcoded
            code numbers with defined constants.
            https://bugs.webkit.org/show_bug.cgi?id=31185
    
            Test: editing/undo/undo-deleteWord.html
    
            * DumpRenderTree/qt/EventSenderQt.cpp:
            (EventSender::keyDown):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index edca0f2..b6d6d04 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-11-08  Shu Chang  <Chang.Shu at nokia.com>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Added support for key code 8 (backspace) in EventSenderQt.
+        This helps to pass the test case below. Also replaced hardcoded
+        code numbers with defined constants.
+        https://bugs.webkit.org/show_bug.cgi?id=31185
+        
+        Test: editing/undo/undo-deleteWord.html
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::keyDown):
+
 2009-11-07  Antonio Gomes  <tonikitoo at webkit.org>
 
         Reviewed by Holger Freyther.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index bbefed9..a0da273 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -30,6 +30,15 @@
 #include "EventSenderQt.h"
 
 //#include <QtDebug>
+
+#define KEYCODE_DEL         127
+#define KEYCODE_BACKSPACE   8
+#define KEYCODE_LEFTARROW   0xf702
+#define KEYCODE_RIGHTARROW  0xf703
+#define KEYCODE_UPARROW     0xf700
+#define KEYCODE_DOWNARROW   0xf701
+
+
 EventSender::EventSender(QWebPage* parent)
     : QObject(parent)
 {
@@ -129,7 +138,7 @@ void EventSender::keyDown(const QString& string, const QStringList& modifiers)
             if (modifs == Qt::ShiftModifier)
                 code = Qt::Key_Backtab;
             s = QString();
-        } else if (code == 127) {
+        } else if (code == KEYCODE_DEL || code == KEYCODE_BACKSPACE) {
             code = Qt::Key_Backspace;
             if (modifs == Qt::AltModifier)
                 modifs = Qt::ControlModifier;
@@ -148,28 +157,28 @@ void EventSender::keyDown(const QString& string, const QStringList& modifiers)
             s = QString();
             code = Qt::Key_Home;
             modifs = 0;
-        } else if (code == 0xf702) {
+        } else if (code == KEYCODE_LEFTARROW) {
             s = QString();
             code = Qt::Key_Left;
             if (modifs & Qt::MetaModifier) {
                 code = Qt::Key_Home;
                 modifs &= ~Qt::MetaModifier;
             }
-        } else if (code == 0xf703) {
+        } else if (code == KEYCODE_RIGHTARROW) {
             s = QString();
             code = Qt::Key_Right;
             if (modifs & Qt::MetaModifier) {
                 code = Qt::Key_End;
                 modifs &= ~Qt::MetaModifier;
             }
-        } else if (code == 0xf700) {
+        } else if (code == KEYCODE_UPARROW) {
             s = QString();
             code = Qt::Key_Up;
             if (modifs & Qt::MetaModifier) {
                 code = Qt::Key_PageUp;
                 modifs &= ~Qt::MetaModifier;
             }
-        } else if (code == 0xf701) {
+        } else if (code == KEYCODE_DOWNARROW) {
             s = QString();
             code = Qt::Key_Down;
             if (modifs & Qt::MetaModifier) {

-- 
WebKit Debian packaging