<!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>[187124] 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/187124">187124</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-21 14:39:58 -0700 (Tue, 21 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERT(m_suspendMessageCount >= 0) fails in ProcessThrottler::didCancelProcessSuspension()
when WebContent process crashes; Network process may never voluntarily suspend
https://bugs.webkit.org/show_bug.cgi?id=147122
<rdar://problem/21906759>
Reviewed by Chris Dumez.
Fixes an issue where the network process may never voluntarily release its process assertion.
Currently the network process always sends both a ProcessReadyToSuspend and CancelPrepareToSuspend
message in response to receiving a PrepareToSuspend message and CancelPrepareToSuspend message,
respectively. The process throttler expects to receive either a ProcessReadyToSuspend message
or a CancelPrepareToSuspend message (and not both) in response to sending the message sequence
PrepareToSuspend, CancelPrepareToSuspend. When a process throttler receives both messages in
response to this sequence then its internal message count becomes imbalanced and it will
never release the process assertion it manages. One user interaction that can cause such an
imbalance, in the process throttler held by NetworkProcessProxy, is switching tabs.
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::cancelPrepareToSuspend): Do not send message NetworkProcessProxy::DidCancelProcessSuspension.
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::didCancelProcessSuspension): Deleted.
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in: Remove message NetworkProcessProxy::DidCancelProcessSuspension.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (187123 => 187124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-21 21:23:26 UTC (rev 187123)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-21 21:39:58 UTC (rev 187124)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-07-21 Daniel Bates <dabates@apple.com>
+
+ ASSERT(m_suspendMessageCount >= 0) fails in ProcessThrottler::didCancelProcessSuspension()
+ when WebContent process crashes; Network process may never voluntarily suspend
+ https://bugs.webkit.org/show_bug.cgi?id=147122
+ <rdar://problem/21906759>
+
+ Reviewed by Chris Dumez.
+
+ Fixes an issue where the network process may never voluntarily release its process assertion.
+
+ Currently the network process always sends both a ProcessReadyToSuspend and CancelPrepareToSuspend
+ message in response to receiving a PrepareToSuspend message and CancelPrepareToSuspend message,
+ respectively. The process throttler expects to receive either a ProcessReadyToSuspend message
+ or a CancelPrepareToSuspend message (and not both) in response to sending the message sequence
+ PrepareToSuspend, CancelPrepareToSuspend. When a process throttler receives both messages in
+ response to this sequence then its internal message count becomes imbalanced and it will
+ never release the process assertion it manages. One user interaction that can cause such an
+ imbalance, in the process throttler held by NetworkProcessProxy, is switching tabs.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::cancelPrepareToSuspend): Do not send message NetworkProcessProxy::DidCancelProcessSuspension.
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::didCancelProcessSuspension): Deleted.
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in: Remove message NetworkProcessProxy::DidCancelProcessSuspension.
+
</ins><span class="cx"> 2015-07-21 Matthew Daiter <mdaiter@apple.com>
</span><span class="cx">
</span><span class="cx"> Make sure to invalidate requests for user media after webpage reset
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (187123 => 187124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-21 21:23:26 UTC (rev 187123)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-21 21:39:58 UTC (rev 187124)
</span><span class="lines">@@ -521,7 +521,10 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::cancelPrepareToSuspend()
</span><span class="cx"> {
</span><del>- parentProcessConnection()->send(Messages::NetworkProcessProxy::DidCancelProcessSuspension(), 0);
</del><ins>+ // Although it is tempting to send a NetworkProcessProxy::DidCancelProcessSuspension message from here
+ // we do not because prepareToSuspend() already replied with a NetworkProcessProxy::ProcessReadyToSuspend
+ // message. And NetworkProcessProxy expects to receive either a NetworkProcessProxy::ProcessReadyToSuspend-
+ // or NetworkProcessProxy::DidCancelProcessSuspension- message, but not both.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::processDidResume()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (187123 => 187124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-07-21 21:23:26 UTC (rev 187123)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-07-21 21:39:58 UTC (rev 187124)
</span><span class="lines">@@ -351,11 +351,6 @@
</span><span class="cx"> send(Messages::NetworkProcess::CancelPrepareToSuspend(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::didCancelProcessSuspension()
-{
- m_throttler.didCancelProcessSuspension();
-}
-
</del><span class="cx"> void NetworkProcessProxy::sendProcessDidResume()
</span><span class="cx"> {
</span><span class="cx"> if (canSendMessage())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (187123 => 187124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-07-21 21:23:26 UTC (rev 187123)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-07-21 21:39:58 UTC (rev 187124)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void didCancelProcessSuspension();
</del><span class="cx"> void processReadyToSuspend();
</span><span class="cx">
</span><span class="cx"> void setIsHoldingLockedFiles(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (187123 => 187124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-07-21 21:23:26 UTC (rev 187123)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-07-21 21:39:58 UTC (rev 187124)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> DidDeleteWebsiteDataForOrigins(uint64_t callbackID)
</span><span class="cx">
</span><span class="cx"> ProcessReadyToSuspend()
</span><del>- DidCancelProcessSuspension()
</del><span class="cx"> SetIsHoldingLockedFiles(bool isHoldingLockedFiles)
</span><span class="cx">
</span><span class="cx"> # Diagnostic messages logging
</span></span></pre>
</div>
</div>
</body>
</html>