[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d3b3eb655ae4b19d550b58c618c2469bdc3d0aa3
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 20:46:16 2010 +0000

    2010-10-12  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] editing/input/emacs-ctrl-o.html
    
            Unskip editing/input/emacs-ctrl-o.html
    
            https://bugs.webkit.org/show_bug.cgi?id=47548
    
            * platform/qt/Skipped:
    2010-10-12  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Antonio Gomes.
    
            [Qt] editing/input/emacs-ctrl-o.html
    
            ctrl-o is bound to a sequence of commands on Mac, namely:
            insertParagraphSeparator then moveLeft. In the DRT, we just interpret
            ctrl-o in EventSenderQt as '\n', i.e. insertParagraphSeparator. As a
            result we only issue one command, so don't generate the change in caret
            position that results in the extra editing delegate messages.
    
            So for the sake of not managing suspicious-looking differences, just
            make DRT issue the appropriate edit commands to pass the test.
    
            https://bugs.webkit.org/show_bug.cgi?id=47548
    
            * DumpRenderTree/qt/EventSenderQt.cpp:
            (EventSender::keyDown):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69597 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cc9c8b5..363ae00 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-12  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] editing/input/emacs-ctrl-o.html
+
+        Unskip editing/input/emacs-ctrl-o.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=47548
+
+        * platform/qt/Skipped:
+
 2010-10-12  Martin Robinson  <mrobinson at igalia.com>
 
         Rebaselined a failing tests. Unskipped editing tests that are passing and
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index a9b58e4..623d63d 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -798,12 +798,6 @@ fast/ruby/rubyDOM-remove-text1.html
 fast/ruby/rubyDOM-remove-text2.html
 
 # ============================================================================= #
-# ------- failing editing/input tests
-# ============================================================================= #
-
-editing/input/emacs-ctrl-o.html
-
-# ============================================================================= #
 # Failing SVG tests
 # ============================================================================= #
 
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0718d9a..211a50d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-10-12  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] editing/input/emacs-ctrl-o.html
+
+        ctrl-o is bound to a sequence of commands on Mac, namely:
+        insertParagraphSeparator then moveLeft. In the DRT, we just interpret
+        ctrl-o in EventSenderQt as '\n', i.e. insertParagraphSeparator. As a
+        result we only issue one command, so don't generate the change in caret
+        position that results in the extra editing delegate messages.
+
+        So for the sake of not managing suspicious-looking differences, just
+        make DRT issue the appropriate edit commands to pass the test.
+
+        https://bugs.webkit.org/show_bug.cgi?id=47548
+
+        * DumpRenderTree/qt/EventSenderQt.cpp:
+        (EventSender::keyDown):
+
 2010-10-12  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
index fd7c925..6fb75a5 100644
--- a/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/EventSenderQt.cpp
@@ -254,9 +254,18 @@ void EventSender::keyDown(const QString& string, const QStringList& modifiers, u
                 modifs = Qt::ControlModifier;
             s = QString();
         } else if (code == 'o' && modifs == Qt::ControlModifier) {
+            // Mimic the emacs ctrl-o binding on Mac by inserting a paragraph
+            // separator and then putting the cursor back to its original
+            // position. Allows us to pass emacs-ctrl-o.html
             s = QLatin1String("\n");
             code = '\n';
             modifs = 0;
+            QKeyEvent event(QEvent::KeyPress, code, modifs, s);
+            sendEvent(m_page, &event);
+            QKeyEvent event2(QEvent::KeyRelease, code, modifs, s);
+            sendEvent(m_page, &event2);
+            s = QString();
+            code = Qt::Key_Left;
         } else if (code == 'y' && modifs == Qt::ControlModifier) {
             s = QLatin1String("c");
             code = 'c';

-- 
WebKit Debian packaging