Changeset 72471 in webkit

Timestamp:

Nov 20, 2010 12:15:10 AM (13 years ago)

Author:

andreas.kling@nokia.com

Message:

2010-11-19 Kristian Amlie <​kristian.amlie@nokia.com>

Reviewed by Andreas Kling.

Fixed handling of QInputMethodEvents with nonzero replacementLength.

These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.

Also made sure that the preeditString is always respected, even if
there is committed text. This is how QLineEdit does it.

​https://bugs.webkit.org/show_bug.cgi?id=49787

• Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent):
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1081 +1081 @@
     }
 
-    if (!ev->commitString().isEmpty())
+    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.
         editor->confirmComposition(ev->commitString());
-    else if (!hasSelection && !ev->preeditString().isEmpty())
+    } else if (!ev->commitString().isEmpty())
+        editor->confirmComposition(ev->commitString());
+    if (!hasSelection && !ev->preeditString().isEmpty())
         editor->setComposition(ev->preeditString(), underlines, 0, 0);
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-11-19  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Fixed handling of QInputMethodEvents with nonzero replacementLength.
+
+        These types of events replace text that is already in the widget, but
+        WebKit did not check for replacementLength at all.
+
+        Also made sure that the preeditString is always respected, even if
+        there is committed text. This is how QLineEdit does it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=49787
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2010-11-19  Benjamin Poulain  <benjamin.poulain@nokia.com>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -1569 +1569 @@
     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);