Title: [175015] branches/safari-600.2-branch/Source/WebKit2
Diff
Modified: branches/safari-600.2-branch/Source/WebKit2/ChangeLog (175014 => 175015)
--- branches/safari-600.2-branch/Source/WebKit2/ChangeLog 2014-10-22 01:58:27 UTC (rev 175014)
+++ branches/safari-600.2-branch/Source/WebKit2/ChangeLog 2014-10-22 02:01:30 UTC (rev 175015)
@@ -1,5 +1,23 @@
2014-10-21 Dana Burkart <[email protected]>
+ Merge r174708
+
+ 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-21 Dana Burkart <[email protected]>
+
Merge r173888
2014-09-23 Jer Noble <[email protected]>
Modified: branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175014 => 175015)
--- branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-22 01:58:27 UTC (rev 175014)
+++ branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-10-22 02:01:30 UTC (rev 175015)
@@ -4320,7 +4320,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.
@@ -4329,8 +4329,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
