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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit d828eedd08724dd79d72d60b6e53558b757d97d2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 20 17:33:26 2010 +0000

    2010-11-20  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r72471.
            http://trac.webkit.org/changeset/72471
            https://bugs.webkit.org/show_bug.cgi?id=49865
    
            broke two IME tests on Qt (Requested by kling on #webkit).
    
            * Api/qwebpage.cpp:
            (QWebPagePrivate::inputMethodEvent):
            * tests/qwebpage/tst_qwebpage.cpp:
            (tst_QWebPage::inputMethods):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72475 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index a81ad08..2e8c6b7 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -1080,15 +1080,9 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
         }
     }
 
-    if (node && ev->replacementLength() > 0) {
-        int cursorPos = frame->selection()->extent().offsetInContainerNode();
-        int start = cursorPos + ev->replacementStart();
-        setSelectionRange(node, start, start + ev->replacementLength());
-        // Commit regardless of whether commitString is empty, to get rid of selection.
+    if (!ev->commitString().isEmpty())
         editor->confirmComposition(ev->commitString());
-    } else if (!ev->commitString().isEmpty())
-        editor->confirmComposition(ev->commitString());
-    if (!hasSelection && !ev->preeditString().isEmpty())
+    else if (!hasSelection && !ev->preeditString().isEmpty())
         editor->setComposition(ev->preeditString(), underlines, 0, 0);
 
     ev->accept();
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index eec494e..83ced7f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-20  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r72471.
+        http://trac.webkit.org/changeset/72471
+        https://bugs.webkit.org/show_bug.cgi?id=49865
+
+        broke two IME tests on Qt (Requested by kling on #webkit).
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2010-11-19  Kristian Amlie  <kristian.amlie at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 1f6ada0..413984a 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1568,20 +1568,6 @@ void tst_QWebPage::inputMethods()
     page->event(&evpres);
     page->event(&evrel);
 
-    {
-        QList<QInputMethodEvent::Attribute> attributes;
-        QInputMethodEvent event(QString(), attributes);
-        event.setCommitString("XXX", 0, 0);
-        page->event(&event);
-        event.setCommitString(QString(), -2, 2); // Erase two characters.
-        page->event(&event);
-        event.setCommitString(QString(), -1, 1); // Erase one character.
-        page->event(&event);
-        variant = page->inputMethodQuery(Qt::ImSurroundingText);
-        value = variant.value<QString>();
-        QCOMPARE(value, QString("QtWebKit"));
-    }
-
     //Move to the start of the line
     page->triggerAction(QWebPage::MoveToStartOfLine);
 

-- 
WebKit Debian packaging