Title: [116135] trunk/Source/WebKit/gtk
- Revision
- 116135
- Author
- [email protected]
- Date
- 2012-05-04 11:58:02 -0700 (Fri, 04 May 2012)
Log Message
Fix the GTK+ debug build after the r116114.
* WebCoreSupport/EditorClientGtk.cpp:
(WebKit::EditorClient::handleInputMethodKeyboardEvent): Update an
assertion to reflect a real method name in PlatformKeyboardEvent
and remove an unnecessary call to preventDefault() which triggered
an assertion failure higher in the call stack.
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (116134 => 116135)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-05-04 18:44:46 UTC (rev 116134)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-05-04 18:58:02 UTC (rev 116135)
@@ -1,3 +1,13 @@
+2012-05-04 Martin Robinson <[email protected]>
+
+ Fix the GTK+ debug build after the r116114.
+
+ * WebCoreSupport/EditorClientGtk.cpp:
+ (WebKit::EditorClient::handleInputMethodKeyboardEvent): Update an
+ assertion to reflect a real method name in PlatformKeyboardEvent
+ and remove an unnecessary call to preventDefault() which triggered
+ an assertion failure higher in the call stack.
+
2012-05-04 Nate Chapin <[email protected]>
Don't require FrameLoaderClient to manufacture a commitData() call for empty documents.
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (116134 => 116135)
--- trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2012-05-04 18:44:46 UTC (rev 116134)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp 2012-05-04 18:58:02 UTC (rev 116135)
@@ -437,12 +437,10 @@
m_updatingComposition = true;
- // This won't prevent a keypress event alone, but PlatformKeyboardEvent returns
- // an empty string when there are composition results. That prevents the delivery
- // of keypress, which is the behavior we want for composition events. See
- // EventHandler::keyEvent.
- event->preventDefault();
- ASSERT(platformEvent->string().isNull());
+ // PlatformKeyboardEvent returns an empty string when there are composition results.
+ // That prevents the delivery of keypress, which is the behavior we want for composition
+ // events. See EventHandler::keyEvent.
+ ASSERT(platformEvent->text().isNull());
if (!compositionResults.confirmedComposition.isNull())
frame->editor()->confirmComposition(compositionResults.confirmedComposition);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
