<!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>[161998] 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/161998">161998</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2014-01-14 13:19:12 -0800 (Tue, 14 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit2 leaks sudden termination assertions when a page with unload handlers is closed.
<https://webkit.org/b/126974> / <rdar://problem/15812954>
When a page with an unload handler is loaded, the web process tells the UI process that it
should disable sudden termination. However, when the page is closed the connection between
the web and UI process is torn down before the web content has a chance to tell the UI
process to reenable sudden termination.
Reviewed by Anders Carlsson.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::WebProcessProxy):
(WebKit::WebProcessProxy::~WebProcessProxy): Balance any outstanding disableSuddenTermination calls.
(WebKit::WebProcessProxy::enableSuddenTermination): Decrement the count.
(WebKit::WebProcessProxy::disableSuddenTermination): Increment the count.
* UIProcess/WebProcessProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161997 => 161998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-14 21:19:12 UTC (rev 161998)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-14 Mark Rowe <mrowe@apple.com>
+
+ WebKit2 leaks sudden termination assertions when a page with unload handlers is closed.
+ <https://webkit.org/b/126974> / <rdar://problem/15812954>
+
+ When a page with an unload handler is loaded, the web process tells the UI process that it
+ should disable sudden termination. However, when the page is closed the connection between
+ the web and UI process is torn down before the web content has a chance to tell the UI
+ process to reenable sudden termination.
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::WebProcessProxy):
+ (WebKit::WebProcessProxy::~WebProcessProxy): Balance any outstanding disableSuddenTermination calls.
+ (WebKit::WebProcessProxy::enableSuddenTermination): Decrement the count.
+ (WebKit::WebProcessProxy::disableSuddenTermination): Increment the count.
+ * UIProcess/WebProcessProxy.h:
+
</ins><span class="cx"> 2014-01-14 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: For Remote Inspection link WebProcess's to their parent UIProcess
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (161997 => 161998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-01-14 21:19:12 UTC (rev 161998)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> , m_processSuppressionEnabled(false)
</span><span class="cx"> #endif
</span><ins>+ , m_numberOfTimesSuddenTerminationWasDisabled(0)
</ins><span class="cx"> {
</span><span class="cx"> connect();
</span><span class="cx"> }
</span><span class="lines">@@ -102,6 +103,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_webConnection)
</span><span class="cx"> m_webConnection->invalidate();
</span><ins>+
+ while (m_numberOfTimesSuddenTerminationWasDisabled-- > 0)
+ WebCore::enableSuddenTermination();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
</span><span class="lines">@@ -662,7 +666,9 @@
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ ASSERT(m_numberOfTimesSuddenTerminationWasDisabled);
</ins><span class="cx"> WebCore::enableSuddenTermination();
</span><ins>+ --m_numberOfTimesSuddenTerminationWasDisabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::disableSuddenTermination()
</span><span class="lines">@@ -671,6 +677,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> WebCore::disableSuddenTermination();
</span><ins>+ ++m_numberOfTimesSuddenTerminationWasDisabled;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<API::Object> WebProcessProxy::apiObjectByConvertingToHandles(API::Object* object)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (161997 => 161998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-01-14 20:59:26 UTC (rev 161997)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2014-01-14 21:19:12 UTC (rev 161998)
</span><span class="lines">@@ -208,6 +208,8 @@
</span><span class="cx"> HashSet<uint64_t> m_processSuppressiblePages;
</span><span class="cx"> bool m_processSuppressionEnabled;
</span><span class="cx"> #endif
</span><ins>+
+ int m_numberOfTimesSuddenTerminationWasDisabled;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>