<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175015] branches/safari-600.2-branch/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175015">175015</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-10-21 19:01:30 -0700 (Tue, 21 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174708">r174708</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6002branchSourceWebKit2ChangeLog">branches/safari-600.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6002branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6002branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebKit2/ChangeLog (175014 => 175015)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-10-21 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174708
+
+ 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-21 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r173888
</span><span class="cx">
</span><span class="cx"> 2014-09-23 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6002branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.2-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (175014 => 175015)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -4320,7 +4320,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::didChangeSelection()
</span><span class="cx"> {
</span><del>-#if (PLATFORM(MAC) && USE(ASYNC_NSTEXTINPUTCLIENT))
</del><ins>+#if PLATFORM(MAC) && USE(ASYNC_NSTEXTINPUTCLIENT)
</ins><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span><span class="cx"> // Abandon the current inline input session if selection changed for any other reason but an input method direct action.
</span><span class="cx"> // 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.
</span><span class="lines">@@ -4329,8 +4329,10 @@
</span><span class="cx"> frame.editor().cancelComposition();
</span><span class="cx"> send(Messages::WebPageProxy::CompositionWasCanceled(editorState()));
</span><span class="cx"> } else
</span><ins>+ send(Messages::WebPageProxy::EditorStateChanged(editorState()));
+#else
+ send(Messages::WebPageProxy::EditorStateChanged(editorState()), pageID(), IPC::DispatchMessageEvenWhenWaitingForSyncReply);
</ins><span class="cx"> #endif
</span><del>- send(Messages::WebPageProxy::EditorStateChanged(editorState()));
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_drawingArea->scheduleCompositingLayerFlush();
</span></span></pre>
</div>
</div>
</body>
</html>