<!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>[166772] tags/Safari-538.27.1/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/166772">166772</a></dd>

<dt>Author</dt> <dd>bshafiei@apple.com</dd>

<dt>Date</dt> <dd>2014-04-04 00:18:19 -0700 (Fri, 04 Apr 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/166769">r166769</a>.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#tagsSafari538271SourceWebKit2ChangeLog">tags/Safari-538.27.1/Source/WebKit2/ChangeLog</a></li>

<li><a href="#tagsSafari538271SourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>

<li><a href="#tagsSafari538271SourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>

<li><a href="#tagsSafari538271SourceWebKit2WebProcessWebPageWebPagecpp">tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>

<li><a href="#tagsSafari538271SourceWebKit2WebProcessWebPageWebPageh">tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="tagsSafari538271SourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.27.1/Source/WebKit2/ChangeLog (166771 => 166772)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.27.1/Source/WebKit2/ChangeLog        2014-04-04 07:10:05 UTC (rev 166771)

+++ tags/Safari-538.27.1/Source/WebKit2/ChangeLog        2014-04-04 07:18:19 UTC (rev 166772)

</span><span class="lines">@@ -1,3 +1,27 @@

</span><ins>+2014-04-04  Babak Shafiei &lt;bshafiei@apple.com&gt;

+

+        Merge r166769

+

+    2014-04-03  Chris Fleizach  &lt;cfleizach@apple.com&gt;

+

+            AX: iOS does not need to spin the run loop on synchronous message calls

+            https://bugs.webkit.org/show_bug.cgi?id=131195

+

+            Reviewed by Dan Bernstein.

+

+            On the Mac platform, we need to spin the run loop while making synchronous calls to avoid VoiceOver hanging.

+            On iOS, this not needed due to architectural differences.

+

+            * WebProcess/WebCoreSupport/WebChromeClient.cpp:

+            (WebKit::WebChromeClient::runJavaScriptAlert):

+            (WebKit::WebChromeClient::runJavaScriptConfirm):

+            (WebKit::WebChromeClient::runJavaScriptPrompt):

+            * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

+            (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):

+            * WebProcess/WebPage/WebPage.cpp:

+            (WebKit::WebPage::synchronousMessagesShouldSpinRunLoop):

+            * WebProcess/WebPage/WebPage.h:

+

</ins><span class="cx"> 2014-04-02  Tim Horton  &lt;timothy_horton@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Remove a FIXME that happened.

</span></span></pre></div>

<a id="tagsSafari538271SourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (166771 => 166772)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp        2014-04-04 07:10:05 UTC (rev 166771)

+++ tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp        2014-04-04 07:18:19 UTC (rev 166772)

</span><span class="lines">@@ -356,7 +356,7 @@

</span><span class="cx">     m_page-&gt;injectedBundleUIClient().willRunJavaScriptAlert(m_page, alertText, webFrame);

</span><span class="cx"> 

<span class="cx">     // FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.

</span><del>-    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</del><ins>+    unsigned syncSendFlags = WebPage::synchronousMessagesShouldSpinRunLoop() ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</ins><span class="cx">     WebProcess::shared().parentProcessConnection()-&gt;sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame-&gt;frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page-&gt;pageID(), std::chrono::milliseconds::max(), syncSendFlags);

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="lines">@@ -369,7 +369,7 @@

</span><span class="cx">     m_page-&gt;injectedBundleUIClient().willRunJavaScriptConfirm(m_page, message, webFrame);

</span><span class="cx"> 

<span class="cx">     // FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.

</span><del>-    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</del><ins>+    unsigned syncSendFlags = WebPage::synchronousMessagesShouldSpinRunLoop() ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</ins><span class="cx">     bool result = false;

</span><span class="cx">     if (!WebProcess::shared().parentProcessConnection()-&gt;sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame-&gt;frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page-&gt;pageID(), std::chrono::milliseconds::max(), syncSendFlags))

</span><span class="cx">         return false;

</span><span class="lines">@@ -386,7 +386,7 @@

</span><span class="cx">     m_page-&gt;injectedBundleUIClient().willRunJavaScriptPrompt(m_page, message, defaultValue, webFrame);

</span><span class="cx"> 

<span class="cx">     // FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.

</span><del>-    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</del><ins>+    unsigned syncSendFlags = WebPage::synchronousMessagesShouldSpinRunLoop() ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</ins><span class="cx">     if (!WebProcess::shared().parentProcessConnection()-&gt;sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame-&gt;frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page-&gt;pageID(), std::chrono::milliseconds::max(), syncSendFlags))

</span><span class="cx">         return false;

</span><span class="cx"> 

</span></span></pre></div>

<a id="tagsSafari538271SourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (166771 => 166772)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp        2014-04-04 07:10:05 UTC (rev 166771)

+++ tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp        2014-04-04 07:18:19 UTC (rev 166772)

</span><span class="lines">@@ -655,7 +655,7 @@

</span><span class="cx"> 

<span class="cx">     // Notify the UIProcess.

<span class="cx">     // FIXME (126021): It is not good to change IPC behavior conditionally, and SpinRunLoopWhileWaitingForReply was known to cause trouble in other similar cases.

</span><del>-    unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</del><ins>+    unsigned syncSendFlags = WebPage::synchronousMessagesShouldSpinRunLoop() ? IPC::SpinRunLoopWhileWaitingForReply : 0;

</ins><span class="cx">     if (!webPage-&gt;sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame-&gt;frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))

</span><span class="cx">         return;

</span><span class="cx"> 

</span></span></pre></div>

<a id="tagsSafari538271SourceWebKit2WebProcessWebPageWebPagecpp"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166771 => 166772)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2014-04-04 07:10:05 UTC (rev 166771)

+++ tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.cpp        2014-04-04 07:18:19 UTC (rev 166772)

</span><span class="lines">@@ -4532,6 +4532,14 @@

<span class="cx">     // That fits with AppKit's idea of an input context.

</span><span class="cx">     return TextIterator::rangeFromLocationAndLength(frame.selection().rootEditableElementOrDocumentElement(), static_cast&lt;int&gt;(range.location), length);

</span><span class="cx"> }

</span><ins>+    

+bool WebPage::synchronousMessagesShouldSpinRunLoop()

+{

+#if PLATFORM(MAC)

+    return WebCore::AXObjectCache::accessibilityEnabled();

+#endif

+    return false;

+}

+    

</ins><span class="cx"> 

</span><del>-

</del><span class="cx"> } // namespace WebKit

</span></span></pre></div>

<a id="tagsSafari538271SourceWebKit2WebProcessWebPageWebPageh"></a>

<div class="modfile"><h4>Modified: tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.h (166771 => 166772)</h4>

<pre class="diff"><span>

<span class="info">--- tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-04-04 07:10:05 UTC (rev 166771)

+++ tags/Safari-538.27.1/Source/WebKit2/WebProcess/WebPage/WebPage.h        2014-04-04 07:18:19 UTC (rev 166772)

</span><span class="lines">@@ -765,7 +765,11 @@

</span><span class="cx"> #if ENABLE(IMAGE_CONTROLS)

</span><span class="cx">     void replaceControlledImage(const ShareableBitmap::Handle&amp;);

</span><span class="cx"> #endif

</span><del>-

</del><ins>+    

+    // Some platforms require accessibility-enabled processes to spin the run loop so that the WebProcess doesn't hang.

+    // While this is not ideal, it does not have to be applied to every platform at the moment.

+    static bool synchronousMessagesShouldSpinRunLoop();

+    

</ins><span class="cx"> private:

</span><span class="cx">     WebPage(uint64_t pageID, const WebPageCreationParameters&amp;);

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>