Title: [174974] releases/WebKitGTK/webkit-2.6/Source/WebKit2
- Revision
- 174974
- Author
- [email protected]
- Date
- 2014-10-21 09:34:24 -0700 (Tue, 21 Oct 2014)
Log Message
Merge r174708 - REGRESSION (r165356): Issues with Japanese text input
https://bugs.webkit.org/show_bug.cgi?id=137719
rdar://problem/18431952
rdar://problem/18483741
Reviewed by Darin Adler.
* WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didChangeSelection):
In sync code path, ensure consistent message delivery order by adding
a DispatchMessageEvenWhenWaitingForSyncReply flag. This way, delayed
EditorStateChanged messages won't confuse UI process.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (174973 => 174974)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 16:32:00 UTC (rev 174973)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-10-21 16:34:24 UTC (rev 174974)
@@ -1,3 +1,17 @@
+2014-10-14 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r165356): Issues with Japanese text input
+ https://bugs.webkit.org/show_bug.cgi?id=137719
+ rdar://problem/18431952
+ rdar://problem/18483741
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::didChangeSelection):
+ In sync code path, ensure consistent message delivery order by adding
+ a DispatchMessageEvenWhenWaitingForSyncReply flag. This way, delayed
+ EditorStateChanged messages won't confuse UI process.
+
2014-10-20 Carlos Garcia Campos <[email protected]>
[GTK] Remove the factory method from DragAndDropHandler
Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (174973 => 174974)
--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-21 16:32:00 UTC (rev 174973)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-21 16:34:24 UTC (rev 174974)
@@ -4311,7 +4311,7 @@
void WebPage::didChangeSelection()
{
-#if (PLATFORM(MAC) && USE(ASYNC_NSTEXTINPUTCLIENT))
+#if PLATFORM(MAC) && USE(ASYNC_NSTEXTINPUTCLIENT)
Frame& frame = m_page->focusController().focusedOrMainFrame();
// Abandon the current inline input session if selection changed for any other reason but an input method direct action.
// FIXME: Many changes that affect composition node do not go through didChangeSelection(). We need to do something when DOM manipulation affects the composition, because otherwise input method's idea about it will be different from Editor's.
@@ -4320,8 +4320,10 @@
frame.editor().cancelComposition();
send(Messages::WebPageProxy::CompositionWasCanceled(editorState()));
} else
+ send(Messages::WebPageProxy::EditorStateChanged(editorState()));
+#else
+ send(Messages::WebPageProxy::EditorStateChanged(editorState()), pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
#endif
- send(Messages::WebPageProxy::EditorStateChanged(editorState()));
#if PLATFORM(IOS)
m_drawingArea->scheduleCompositingLayerFlush();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
