<!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>[161152] trunk/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/161152">161152</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 13:43:44 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use std::chrono::milliseconds for all IPC message timeouts
https://bugs.webkit.org/show_bug.cgi?id=126303
Reviewed by Andreas Kling.
* Platform/IPC/Connection.cpp:
(IPC::Connection::sendSyncMessage):
(IPC::Connection::sendSyncMessageFromSecondaryThread):
(IPC::Connection::waitForSyncReply):
* Platform/IPC/Connection.h:
(IPC::Connection::sendSync):
* Platform/IPC/MessageSender.h:
(IPC::MessageSender::sendSync):
* Shared/ChildProcessProxy.h:
(WebKit::ChildProcessProxy::sendSync):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::stringSelectionForPasteboard):
(WebKit::WebPageProxy::dataSelectionForPasteboard):
(WebKit::WebPageProxy::readSelectionFromPasteboard):
(WebKit::WebPageProxy::shouldDelayWindowOrderingForEvent):
(WebKit::WebPageProxy::acceptsFirstMouse):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::postSynchronousMessage):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::runJavaScriptAlert):
(WebKit::WebChromeClient::runJavaScriptConfirm):
(WebKit::WebChromeClient::runJavaScriptPrompt):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
* WebProcess/WebPage/WebInspector.cpp:
(WebKit::WebInspector::createInspectorPage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageSenderh">trunk/Source/WebKit2/Platform/IPC/MessageSender.h</a></li>
<li><a href="#trunkSourceWebKit2SharedChildProcessProxyh">trunk/Source/WebKit2/Shared/ChildProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebInspectorcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2013-12-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Use std::chrono::milliseconds for all IPC message timeouts
+ https://bugs.webkit.org/show_bug.cgi?id=126303
+
+ Reviewed by Andreas Kling.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::sendSyncMessage):
+ (IPC::Connection::sendSyncMessageFromSecondaryThread):
+ (IPC::Connection::waitForSyncReply):
+ * Platform/IPC/Connection.h:
+ (IPC::Connection::sendSync):
+ * Platform/IPC/MessageSender.h:
+ (IPC::MessageSender::sendSync):
+ * Shared/ChildProcessProxy.h:
+ (WebKit::ChildProcessProxy::sendSync):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::stringSelectionForPasteboard):
+ (WebKit::WebPageProxy::dataSelectionForPasteboard):
+ (WebKit::WebPageProxy::readSelectionFromPasteboard):
+ (WebKit::WebPageProxy::shouldDelayWindowOrderingForEvent):
+ (WebKit::WebPageProxy::acceptsFirstMouse):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::postSynchronousMessage):
+ * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+ (WebKit::WebChromeClient::runJavaScriptAlert):
+ (WebKit::WebChromeClient::runJavaScriptConfirm):
+ (WebKit::WebChromeClient::runJavaScriptPrompt):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDecidePolicyForResponse):
+ * WebProcess/WebPage/WebInspector.cpp:
+ (WebKit::WebInspector::createInspectorPage):
+
+2013-12-30 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove empty directories.
</span><span class="cx">
</span><span class="cx"> * Platform/CoreIPC: Removed.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<MessageDecoder> Connection::sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<MessageEncoder> encoder, double timeout, unsigned syncSendFlags)
</del><ins>+std::unique_ptr<MessageDecoder> Connection::sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<MessageEncoder> encoder, std::chrono::milliseconds timeout, unsigned syncSendFlags)
</ins><span class="cx"> {
</span><span class="cx"> if (RunLoop::current() != m_clientRunLoop) {
</span><span class="cx"> // No flags are supported for synchronous messages sent from secondary threads.
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> return reply;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<MessageDecoder> Connection::sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<MessageEncoder> encoder, double timeout)
</del><ins>+std::unique_ptr<MessageDecoder> Connection::sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<MessageEncoder> encoder, std::chrono::milliseconds timeout)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::current() != m_clientRunLoop);
</span><span class="cx">
</span><span class="lines">@@ -500,12 +500,8 @@
</span><span class="cx">
</span><span class="cx"> sendMessage(std::move(encoder), 0);
</span><span class="cx">
</span><del>- // Use a really long timeout.
- if (timeout == NoTimeout)
- timeout = 1e10;
</del><ins>+ pendingReply.semaphore.wait(currentTime() + (timeout.count() / 1000.0));
</ins><span class="cx">
</span><del>- pendingReply.semaphore.wait(currentTime() + timeout);
-
</del><span class="cx"> // Finally, pop the pending sync reply information.
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_syncReplyStateMutex);
</span><span class="lines">@@ -516,14 +512,10 @@
</span><span class="cx"> return std::move(pendingReply.replyDecoder);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, double timeout, unsigned syncSendFlags)
</del><ins>+std::unique_ptr<MessageDecoder> Connection::waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags)
</ins><span class="cx"> {
</span><del>- // Use a really long timeout.
- if (timeout == NoTimeout)
- timeout = 1e10;
</del><ins>+ double absoluteTime = currentTime() + (timeout.count() / 1000.0);
</ins><span class="cx">
</span><del>- double absoluteTime = currentTime() + timeout;
-
</del><span class="cx"> bool timedOut = false;
</span><span class="cx"> while (!timedOut) {
</span><span class="cx"> // First, check if we have any messages that we need to process.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -155,16 +155,14 @@
</span><span class="cx">
</span><span class="cx"> void postConnectionDidCloseOnConnectionWorkQueue();
</span><span class="cx">
</span><del>- static const int NoTimeout = -1;
-
</del><span class="cx"> template<typename T> bool send(T&& message, uint64_t destinationID, unsigned messageSendFlags = 0);
</span><del>- template<typename T> bool sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, double timeout = NoTimeout, unsigned syncSendFlags = 0);
</del><ins>+ template<typename T> bool sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, std::chrono::milliseconds timeout = std::chrono::milliseconds::max(), unsigned syncSendFlags = 0);
</ins><span class="cx"> template<typename T> bool waitForAndDispatchImmediately(uint64_t destinationID, std::chrono::milliseconds timeout);
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MessageEncoder> createSyncMessageEncoder(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, uint64_t& syncRequestID);
</span><span class="cx"> bool sendMessage(std::unique_ptr<MessageEncoder>, unsigned messageSendFlags = 0);
</span><del>- std::unique_ptr<MessageDecoder> sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<MessageEncoder>, double timeout, unsigned syncSendFlags = 0);
- std::unique_ptr<MessageDecoder> sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<MessageEncoder>, double timeout);
</del><ins>+ std::unique_ptr<MessageDecoder> sendSyncMessage(uint64_t syncRequestID, std::unique_ptr<MessageEncoder>, std::chrono::milliseconds timeout, unsigned syncSendFlags = 0);
+ std::unique_ptr<MessageDecoder> sendSyncMessageFromSecondaryThread(uint64_t syncRequestID, std::unique_ptr<MessageEncoder>, std::chrono::milliseconds timeout);
</ins><span class="cx"> bool sendSyncReply(std::unique_ptr<MessageEncoder>);
</span><span class="cx">
</span><span class="cx"> void wakeUpRunLoop();
</span><span class="lines">@@ -183,7 +181,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<MessageDecoder> waitForMessage(StringReference messageReceiverName, StringReference messageName, uint64_t destinationID, std::chrono::milliseconds timeout);
</span><span class="cx">
</span><del>- std::unique_ptr<MessageDecoder> waitForSyncReply(uint64_t syncRequestID, double timeout, unsigned syncSendFlags);
</del><ins>+ std::unique_ptr<MessageDecoder> waitForSyncReply(uint64_t syncRequestID, std::chrono::milliseconds timeout, unsigned syncSendFlags);
</ins><span class="cx">
</span><span class="cx"> // Called on the connection work queue.
</span><span class="cx"> void processIncomingMessage(std::unique_ptr<MessageDecoder>);
</span><span class="lines">@@ -321,7 +319,7 @@
</span><span class="cx"> return sendMessage(std::move(encoder), messageSendFlags);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> bool Connection::sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, double timeout, unsigned syncSendFlags)
</del><ins>+template<typename T> bool Connection::sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, std::chrono::milliseconds timeout, unsigned syncSendFlags)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(T::isSync, SyncMessageExpected);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageSenderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageSender.h (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageSender.h 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/Platform/IPC/MessageSender.h 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>- bool sendSync(T&& message, typename T::Reply&& reply, double timeout = Connection::NoTimeout, unsigned syncSendFlags = 0)
</del><ins>+ bool sendSync(T&& message, typename T::Reply&& reply, std::chrono::milliseconds timeout = std::chrono::milliseconds::max(), unsigned syncSendFlags = 0)
</ins><span class="cx"> {
</span><span class="cx"> static_assert(T::isSync, "Message is not sync!");
</span><span class="cx">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>- bool sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, double timeout = Connection::NoTimeout, unsigned syncSendFlags = 0)
</del><ins>+ bool sendSync(T&& message, typename T::Reply&& reply, uint64_t destinationID, std::chrono::milliseconds timeout = std::chrono::milliseconds::max(), unsigned syncSendFlags = 0)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(messageSenderConnection());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedChildProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ChildProcessProxy.h (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/Shared/ChildProcessProxy.h 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> void terminate();
</span><span class="cx">
</span><span class="cx"> template<typename T> bool send(T&& message, uint64_t destinationID, unsigned messageSendFlags = 0);
</span><del>- template<typename T> bool sendSync(T&& message, typename T::Reply&&, uint64_t destinationID, double timeout = 1);
</del><ins>+ template<typename T> bool sendSync(T&& message, typename T::Reply&&, uint64_t destinationID, std::chrono::milliseconds timeout = std::chrono::seconds(1));
</ins><span class="cx">
</span><span class="cx"> IPC::Connection* connection() const
</span><span class="cx"> {
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename U>
</span><del>-bool ChildProcessProxy::sendSync(U&& message, typename U::Reply&& reply, uint64_t destinationID, double timeout)
</del><ins>+bool ChildProcessProxy::sendSync(U&& message, typename U::Reply&& reply, uint64_t destinationID, std::chrono::milliseconds timeout)
</ins><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(U::isSync, SyncMessageExpected);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return value;
</span><span class="cx">
</span><del>- const double messageTimeout = 20;
</del><ins>+ const auto messageTimeout = std::chrono::seconds(20);
</ins><span class="cx"> process().sendSync(Messages::WebPage::GetStringSelectionForPasteboard(), Messages::WebPage::GetStringSelectionForPasteboard::Reply(value), m_pageID, messageTimeout);
</span><span class="cx"> return value;
</span><span class="cx"> }
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> uint64_t size = 0;
</span><del>- const double messageTimeout = 20;
</del><ins>+ const auto messageTimeout = std::chrono::seconds(20);
</ins><span class="cx"> process().sendSync(Messages::WebPage::GetDataSelectionForPasteboard(pasteboardType),
</span><span class="cx"> Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_pageID, messageTimeout);
</span><span class="cx"> if (handle.isNull())
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><del>- const double messageTimeout = 20;
</del><ins>+ const auto messageTimeout = std::chrono::seconds(20);
</ins><span class="cx"> process().sendSync(Messages::WebPage::ReadSelectionFromPasteboard(pasteboardName), Messages::WebPage::ReadSelectionFromPasteboard::Reply(result), m_pageID, messageTimeout);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><del>- const double messageTimeout = 3;
</del><ins>+ const auto messageTimeout = std::chrono::seconds(3);
</ins><span class="cx"> process().sendSync(Messages::WebPage::ShouldDelayWindowOrderingEvent(event), Messages::WebPage::ShouldDelayWindowOrderingEvent::Reply(result), m_pageID, messageTimeout);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -489,7 +489,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> bool result = false;
</span><del>- const double messageTimeout = 3;
</del><ins>+ const auto messageTimeout = std::chrono::seconds(3);
</ins><span class="cx"> process().sendSync(Messages::WebPage::AcceptsFirstMouse(eventNumber, event), Messages::WebPage::AcceptsFirstMouse::Reply(result), m_pageID, messageTimeout);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> encoder->encode(messageName);
</span><span class="cx"> encoder->encode(InjectedBundleUserMessageEncoder(messageBody));
</span><span class="cx">
</span><del>- std::unique_ptr<IPC::MessageDecoder> replyDecoder = WebProcess::shared().parentProcessConnection()->sendSyncMessage(syncRequestID, std::move(encoder), IPC::Connection::NoTimeout);
</del><ins>+ std::unique_ptr<IPC::MessageDecoder> replyDecoder = WebProcess::shared().parentProcessConnection()->sendSyncMessage(syncRequestID, std::move(encoder), std::chrono::milliseconds::max());
</ins><span class="cx"> if (!replyDecoder || !replyDecoder->decode(messageDecoder)) {
</span><span class="cx"> returnData = nullptr;
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebChromeClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx">
</span><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><span class="cx"> unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
</span><del>- WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags);
</del><ins>+ WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptAlert(webFrame->frameID(), alertText), Messages::WebPageProxy::RunJavaScriptAlert::Reply(), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebChromeClient::runJavaScriptConfirm(Frame* frame, const String& message)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><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><span class="cx"> unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
</span><span class="cx"> bool result = false;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags))
</del><ins>+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptConfirm(webFrame->frameID(), message), Messages::WebPageProxy::RunJavaScriptConfirm::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return result;
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx">
</span><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><span class="cx"> unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
</span><del>- if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), IPC::Connection::NoTimeout, syncSendFlags))
</del><ins>+ if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebPageProxy::RunJavaScriptPrompt(webFrame->frameID(), message, defaultValue), Messages::WebPageProxy::RunJavaScriptPrompt::Reply(result), m_page->pageID(), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return !result.isNull();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -650,7 +650,7 @@
</span><span class="cx"> // Notify the UIProcess.
</span><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><span class="cx"> unsigned syncSendFlags = (WebCore::AXObjectCache::accessibilityEnabled()) ? IPC::SpinRunLoopWhileWaitingForReply : 0;
</span><del>- if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), IPC::Connection::NoTimeout, syncSendFlags))
</del><ins>+ if (!webPage->sendSync(Messages::WebPageProxy::DecidePolicyForResponseSync(m_frame->frameID(), response, request, canShowMIMEType, listenerID, InjectedBundleUserMessageEncoder(userData.get())), Messages::WebPageProxy::DecidePolicyForResponseSync::Reply(receivedPolicyAction, policyAction, downloadID), std::chrono::milliseconds::max(), syncSendFlags))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We call this synchronously because CFNetwork can only convert a loading connection to a download from its didReceiveResponse callback.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp (161151 => 161152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2013-12-30 21:05:50 UTC (rev 161151)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebInspector.cpp 2013-12-30 21:43:44 UTC (rev 161152)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::shared().parentProcessConnection()->sendSync(Messages::WebInspectorProxy::CreateInspectorPage(),
</span><span class="cx"> Messages::WebInspectorProxy::CreateInspectorPage::Reply(inspectorPageID, parameters),
</span><del>- m_page->pageID(), IPC::Connection::NoTimeout)) {
</del><ins>+ m_page->pageID(), std::chrono::milliseconds::max())) {
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>