Changeset 174708 in webkit

Timestamp:

Oct 14, 2014 4:23:00 PM (10 years ago)

Author:

ap@apple.com

Message:

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.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-10-14  Alexey Proskuryakov  <ap@apple.com>
+
+        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-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -4318 +4318 @@
 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.
@@ -4327 +4327 @@
         send(Messages::WebPageProxy::CompositionWasCanceled(editorState()));
     } else
-#endif
         send(Messages::WebPageProxy::EditorStateChanged(editorState()));
+#else
+    send(Messages::WebPageProxy::EditorStateChanged(editorState()), pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
+#endif
 
 #if PLATFORM(IOS)