Title: [125701] trunk/Source/WebKit/blackberry
- Revision
- 125701
- Author
- [email protected]
- Date
- 2012-08-15 13:40:04 -0700 (Wed, 15 Aug 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (125700 => 125701)
--- trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 19:58:58 UTC (rev 125700)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2012-08-15 20:40:04 UTC (rev 125701)
@@ -1,3 +1,21 @@
+2012-08-15 Mike Fenton <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Upstream BlackBerry build fixes
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp (125700 => 125701)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-08-15 19:58:58 UTC (rev 125700)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InputHandler.cpp 2012-08-15 20:40:04 UTC (rev 125701)
@@ -2013,12 +2013,13 @@
removeAttributedTextMarker();
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 */);
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
