[webkit-changes] [103753] trunk/Source/WebKit2

[kenneth]

Title: [103753] trunk/Source/WebKit2

Revision

103753

Author

kenn...@webkit.org

Date

2011-12-27 19:16:31 -0800 (Tue, 27 Dec 2011)

Log Message

[Qt] Make the inputMethodEvent set or confirm the composition
https://bugs.webkit.org/show_bug.cgi?id=75256

Reviewed by Chang Shu.

* UIProcess/qt/QtWebPageEventHandler.cpp:
(QtWebPageEventHandler::inputMethodEvent):

Modified Paths

• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

Diff

Modified: trunk/Source/WebKit2/ChangeLog (103752 => 103753)

--- trunk/Source/WebKit2/ChangeLog	2011-12-28 02:54:10 UTC (rev 103752)
+++ trunk/Source/WebKit2/ChangeLog	2011-12-28 03:16:31 UTC (rev 103753)
@@ -1,3 +1,13 @@
+2011-12-27  Kenneth Rohde Christiansen  <kenn...@webkit.org>
+
+        [Qt] Make the inputMethodEvent set or confirm the composition
+        https://bugs.webkit.org/show_bug.cgi?id=75256
+
+        Reviewed by Chang Shu.
+
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (QtWebPageEventHandler::inputMethodEvent):
+
 2011-12-26  Mark Rowe  <mr...@apple.com>
 
         <http://webkit.org/b/75196> REGRESSION(r103643): Command-clicking a link no longer opens a new tab.

Modified: trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp (103752 => 103753)

--- trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2011-12-28 02:54:10 UTC (rev 103752)
+++ trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp	2011-12-28 03:16:31 UTC (rev 103753)
@@ -321,6 +321,9 @@
     QString commit = ev->commitString();
     QString composition = ev->preeditString();
 
+    int replacementStart = ev->replacementStart();
+    int replacementLength = ev->replacementLength();
+
     // NOTE: We might want to handle events of one char as special
     // and resend them as key events to make web site completion work.
 
@@ -361,17 +364,20 @@
                 selectionStart = attr.start;
                 selectionLength = attr.length;
 
-                ASSERT_UNUSED(selectionStart, selectionStart >= 0);
-                ASSERT_UNUSED(selectionLength, selectionLength >= 0);
+                ASSERT(selectionStart >= 0);
+                ASSERT(selectionLength >= 0);
                 break;
             }
         }
 
-        // FIXME: Confirm the composition here.
+        m_webPageProxy->confirmComposition(commit, selectionStart, selectionLength);
     } else {
-        ASSERT_UNUSED(cursorPositionWithinComposition, cursorPositionWithinComposition >= 0);
+        ASSERT(cursorPositionWithinComposition >= 0);
+        ASSERT(replacementStart >= 0);
 
-        // FIXME: Set the composition here.
+        m_webPageProxy->setComposition(composition, underlines,
+            cursorPositionWithinComposition, cursorPositionWithinComposition,
+            replacementStart, replacementLength);
     }
 
     ev->accept();

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes