Changeset 125701 in webkit

Timestamp:

Aug 15, 2012 1:40:04 PM (12 years ago)

Author:

mifenton@rim.com

Message:

[BlackBerry] Use the unconverted attribute instead of composing when deciding to how to handle key input.
​https://bugs.webkit.org/show_bug.cgi?id=94132

Reviewed by Rob Buis.

PR 139838.

Switch direct key input handling to be based on the unconverted
attribute being present. Converted keys, even during composition
are now input directly.

Reviewed Internally by Nima Ghanavatian.

• WebKitSupport/InputHandler.cpp:

(BlackBerry::WebKit::InputHandler::setText):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebKitSupport/InputHandler.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2012-08-15  Mike Fenton  <mifenton@rim.com>
+
+        [BlackBerry] Use the unconverted attribute instead of composing when deciding to how to handle key input.
+        https://bugs.webkit.org/show_bug.cgi?id=94132
+
+        Reviewed by Rob Buis.
+
+        PR 139838.
+
+        Switch direct key input handling to be based on the unconverted
+        attribute being present.  Converted keys, even during composition
+        are now input directly.
+
+        Reviewed Internally by Nima Ghanavatian.
+
+        * WebKitSupport/InputHandler.cpp:
+        (BlackBerry::WebKit::InputHandler::setText):
+
 2012-08-15  Joshua Netterfield  <jnetterfield@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp

@@ -2014 +2014 @@
 
     if (isTrailingSingleCharacter(changedSpan, textLength, composingTextLength)) {
-        // Handle the case where text is being composed.
-        if (firstSpanInString(spannableString, COMPOSED_TEXT_ATTRIB)) {
-            InputLog(LogLevelInfo, "InputHandler::setText Single trailing character detected.  Text is being composed.");
+        // If the text is unconverted, do not allow JS processing as it is not a "real"
+        // character in the field.
+        if (firstSpanInString(spannableString, UNCONVERTED_TEXT_ATTRIB)) {
+            InputLog(LogLevelInfo, "InputHandler::setText Single trailing character detected.  Text is unconverted.");
             return editor->command("InsertText").execute(textToInsert.right(1));
         }
-        InputLog(LogLevelInfo, "InputHandler::setText Single trailing character detected. Text is not being composed.");
+        InputLog(LogLevelInfo, "InputHandler::setText Single trailing character detected.");
         return handleKeyboardInput(Platform::KeyboardEvent(textToInsert[textLength - 1], Platform::KeyboardEvent::KeyChar, 0), false /* changeIsPartOfComposition */);
     }