<!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>[178982] branches/safari-600.5-branch/Source</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/178982">178982</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 21:38:55 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174708">r174708</a>. rdar://problem/19451256</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchSourceJavaScriptCoreChangeLog">branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2ChangeLog">branches/safari-600.5-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessPageClienth">branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessmacPageClientImplh">branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#branchessafari6005branchSourceWebKit2UIProcessmacPageClientImplmm">branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/JavaScriptCore/ChangeLog 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174708. rdar://problem/19451256
+
+ 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r175629. rdar://problem/19465100
+
+ 2014-11-05 Alexey Proskuryakov <ap@apple.com>
+
+ Incorrect sandbox_check in RemoteInspector.mm
+ https://bugs.webkit.org/show_bug.cgi?id=138408
+
+ Reviewed by Joseph Pecoraro.
+
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::canAccessWebInspectorMachPort):
+
+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r174381. rdar://problem/19450841
</span><span class="cx">
</span><span class="cx"> 2014-10-06 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/ChangeLog (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/ChangeLog 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174708. rdar://problem/19451256
+
+ 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.
+
+2015-01-22 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r177152. rdar://problem/19451288
</span><span class="cx">
</span><span class="cx"> 2014-12-11 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/PageClient.h 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -185,6 +185,10 @@
</span><span class="cx"> virtual void wheelEventWasNotHandledByWebCore(const NativeWebWheelEvent&) = 0;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+ virtual void notifyApplicationAboutInputContextChange() = 0;
+#endif
+
</ins><span class="cx"> #if USE(APPKIT)
</span><span class="cx"> virtual void setPromisedData(const String& pasteboardName, PassRefPtr<WebCore::SharedBuffer> imageBuffer, const String& filename, const String& extension, const String& title,
</span><span class="cx"> const String& url, const String& visibleUrl, PassRefPtr<WebCore::SharedBuffer> archiveBuffer) = 0;
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -3495,6 +3495,7 @@
</span><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> bool closedComposition = !editorState.shouldIgnoreCompositionSelectionChange && !editorState.hasComposition && (m_editorState.hasComposition || m_temporarilyClosedComposition);
</span><span class="cx"> m_temporarilyClosedComposition = editorState.shouldIgnoreCompositionSelectionChange && (m_temporarilyClosedComposition || m_editorState.hasComposition) && !editorState.hasComposition;
</span><ins>+ bool editabilityChanged = m_editorState.isContentEditable != editorState.isContentEditable;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_editorState = editorState;
</span><span class="lines">@@ -3511,6 +3512,10 @@
</span><span class="cx"> #if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
</span><span class="cx"> if (closedComposition)
</span><span class="cx"> m_pageClient.notifyInputContextAboutDiscardedComposition();
</span><ins>+ if (editabilityChanged) {
+ // This is only needed in sync code path, because AppKit automatically refreshes input context for async clients (<rdar://problem/18604360>).
+ m_pageClient.notifyApplicationAboutInputContextChange();
+ }
</ins><span class="cx"> if (editorState.hasComposition) {
</span><span class="cx"> // Abandon the current inline input session if selection changed for any other reason but an input method changing the composition.
</span><span class="cx"> // FIXME: This logic should be in WebCore, no need to round-trip to UI process to cancel the composition.
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -98,6 +98,9 @@
</span><span class="cx"> virtual void updateSecureInputState() override;
</span><span class="cx"> virtual void resetSecureInputState() override;
</span><span class="cx"> virtual void notifyInputContextAboutDiscardedComposition() override;
</span><ins>+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+ virtual void notifyApplicationAboutInputContextChange() override;
+#endif
</ins><span class="cx">
</span><span class="cx"> virtual WebCore::FloatRect convertToDeviceSpace(const WebCore::FloatRect&);
</span><span class="cx"> virtual WebCore::FloatRect convertToUserSpace(const WebCore::FloatRect&);
</span></span></pre></div>
<a id="branchessafari6005branchSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (178981 => 178982)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-23 05:38:42 UTC (rev 178981)
+++ branches/safari-600.5-branch/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-01-23 05:38:55 UTC (rev 178982)
</span><span class="lines">@@ -429,6 +429,13 @@
</span><span class="cx"> [m_wkView _notifyInputContextAboutDiscardedComposition];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC) && !USE(ASYNC_NSTEXTINPUTCLIENT)
+void PageClientImpl::notifyApplicationAboutInputContextChange()
+{
+ [NSApp updateWindows];
+}
+#endif
+
</ins><span class="cx"> FloatRect PageClientImpl::convertToDeviceSpace(const FloatRect& rect)
</span><span class="cx"> {
</span><span class="cx"> return [m_wkView _convertToDeviceSpace:rect];
</span></span></pre>
</div>
</div>
</body>
</html>