Title: [166388] trunk/Source/WebKit2
- Revision
- 166388
- Author
- [email protected]
- Date
- 2014-03-27 17:36:15 -0700 (Thu, 27 Mar 2014)
Log Message
Confirm composition in resignFirstResponder, don't cancel it
https://bugs.webkit.org/show_bug.cgi?id=130852
Reviewed by Darin Adler.
* UIProcess/API/mac/WKView.mm: (-[WKView resignFirstResponder]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (166387 => 166388)
--- trunk/Source/WebKit2/ChangeLog 2014-03-28 00:27:27 UTC (rev 166387)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-28 00:36:15 UTC (rev 166388)
@@ -1,3 +1,12 @@
+2014-03-27 Alexey Proskuryakov <[email protected]>
+
+ Confirm composition in resignFirstResponder, don't cancel it
+ https://bugs.webkit.org/show_bug.cgi?id=130852
+
+ Reviewed by Darin Adler.
+
+ * UIProcess/API/mac/WKView.mm: (-[WKView resignFirstResponder]):
+
2014-03-27 Pratik Solanki <[email protected]>
[iOS WebKit2] Don't pass disk cache directory path on iOS
Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm (166387 => 166388)
--- trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-28 00:27:27 UTC (rev 166387)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm 2014-03-28 00:36:15 UTC (rev 166388)
@@ -370,8 +370,12 @@
{
_data->_inResignFirstResponder = true;
+#if USE(ASYNC_NSTEXTINPUTCLIENT)
+ _data->_page->confirmCompositionAsync();
+#else
if (_data->_page->editorState().hasComposition && !_data->_page->editorState().shouldIgnoreCompositionSelectionChange)
_data->_page->cancelComposition();
+#endif
[self _notifyInputContextAboutDiscardedComposition];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
