Changeset 70259 in webkit

Timestamp:

Oct 21, 2010 12:53:09 PM (14 years ago)

Author:

robert@webkit.org

Message:

2010-10-21 Robert Hogan <​robert@webkit.org>

Reviewed by Simon Hausmann.

[Qt] Sending a QInputMethodEvent::Selection event forces the

Editor to go into Composition mode

Improve QWebPage handling of input method events:

• Selections don't trigger entering composition mode.
• Handle multiple selections

Also remove redundant cancellation of composition in tst_qwebpage.
There is no composition in progress at that point.

Finally, move infiniteLoopJS() to the end of the tst_qwebpage unit
tests - so you don't have to wait for it to complete when running
other tests.

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

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

Location:

trunk/WebKit/qt

Files:

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

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1009 +1009 @@
     WebCore::Frame *frame = page->focusController()->focusedOrMainFrame();
     WebCore::Editor *editor = frame->editor();
-    QInputMethodEvent::Attribute selection(QInputMethodEvent::Selection, 0, 0, QVariant());
 
     if (!editor->canEdit()) {
@@ -1049 +1048 @@
         }
         case QInputMethodEvent::Selection: {
-            selection = a;
             hasSelection = true;
+            // A selection in the inputMethodEvent is always reflected in the visible text
+            if (renderTextControl) {
+                renderTextControl->setSelectionStart(qMin(a.start, (a.start + a.length)));
+                renderTextControl->setSelectionEnd(qMax(a.start, (a.start + a.length)));
+            }
+
+            if (!ev->preeditString().isEmpty()) {
+                editor->setComposition(ev->preeditString(), underlines,
+                                      (a.length < 0) ? a.start + a.length : a.start,
+                                      (a.length < 0) ? a.start : a.start + a.length);
+            } else {
+                // If we are in the middle of a composition, an empty pre-edit string and a selection of zero
+                // cancels the current composition
+                if (editor->hasComposition() && (a.start + a.length == 0))
+                    editor->setComposition(QString(), underlines, 0, 0);
+            }
             break;
         }
@@ -1058 +1072 @@
     if (!ev->commitString().isEmpty())
         editor->confirmComposition(ev->commitString());
-    else {
-        // 1. empty preedit with a selection attribute, and start/end of 0 cancels composition
-        // 2. empty preedit with a selection attribute, and start/end of non-0 updates selection of current preedit text
-        // 3. populated preedit with a selection attribute, and start/end of 0 or non-0 updates selection of supplied preedit text
-        // 4. otherwise event is updating supplied pre-edit text
-        QString preedit = ev->preeditString();
-        if (hasSelection) {
-            QString text = (renderTextControl) ? QString(renderTextControl->text()) : QString();
-            if (preedit.isEmpty() && selection.start + selection.length > 0)
-                preedit = text;
-            editor->setComposition(preedit, underlines,
-                                   (selection.length < 0) ? selection.start + selection.length : selection.start,
-                                   (selection.length < 0) ? selection.start : selection.start + selection.length);
-        } else if (!preedit.isEmpty())
-            editor->setComposition(preedit, underlines, preedit.length(), 0);
-    }
+    else if (!hasSelection && !ev->preeditString().isEmpty())
+        editor->setComposition(ev->preeditString(), underlines, 0, ev->preeditString().length());
 
     ev->accept();
@@ -1330 +1330 @@
                 QString text = renderTextControl->text();
                 RefPtr<Range> range = editor->compositionRange();
-                if (range) {
+                if (range)
                     text.remove(range->startPosition().offsetInContainerNode(), TextIterator::rangeLength(range.get()));
-                }
                 return QVariant(text);
             }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-10-21  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Sending a QInputMethodEvent::Selection event forces the
+             Editor to go into Composition mode
+
+        Improve QWebPage handling of input method events:
+         - Selections don't trigger entering composition mode.
+         - Handle multiple selections
+
+        Also remove redundant cancellation of composition in tst_qwebpage.
+        There is no composition in progress at that point.
+
+        Finally, move infiniteLoopJS() to the end of the tst_qwebpage unit
+        tests - so you don't have to wait for it to complete when running
+        other tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39625
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        (QWebPage::inputMethodQuery):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2010-10-20  Luiz Agostini  <luiz.agostini@openbossa.org>
 

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

@@ -78 +78 @@
 
     void acceptNavigationRequest();
-    void infiniteLoopJS();
     void geolocationRequestJS();
     void loadFinished();
@@ -129 +128 @@
     void findText();
     void supportedContentType();
+    void infiniteLoopJS();
     
 private:
@@ -1517 +1517 @@
     QCOMPARE(selectionValue, QString("eb"));
 
-    //Cancel current composition first
-    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
-    QInputMethodEvent eventSelection2("",inputAttributes);
-    page->event(&eventSelection2);
-
     //Set selection with negative length
     inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());