<!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>[184729] branches/safari-601.1.32.2-branch/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/184729">184729</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-05-21 12:51:39 -0700 (Thu, 21 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/184370">r184370</a>. rdar://problem/20368630</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011322branchSourceWebKit2ChangeLog">branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2SharedChildProcessProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2SharedChildProcessProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessNetworkNetworkProcessProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessPluginsPluginProcessProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessPluginsPluginProcessProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebFrameProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebFrameProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebPageProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebProcessLifetimeTrackercpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebProcessLifetimeTrackerh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebProcessProxycpp">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#branchessafari6011322branchSourceWebKit2UIProcessWebProcessProxyh">branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011322branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/ChangeLog 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -1,5 +1,66 @@
</span><span class="cx"> 2015-05-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r184370.
+
+ 2015-05-14 Brady Eidson <beidson@apple.com>
+
+ Rename connectionDidClose and related methods to be more clear.
+ https://bugs.webkit.org/show_bug.cgi?id=145030
+
+ Reviewed by Darin Adler.
+
+ These methods were easy to confuse with "Connection::Client::didClose()", yet they
+ were about something much more explicit: A child process being shut down by the UI Process.
+
+ Let's call them as such.
+
+ * Shared/ChildProcessProxy.cpp:
+ (WebKit::ChildProcessProxy::shutDownProcess):
+ (WebKit::ChildProcessProxy::clearConnection): Deleted.
+ (WebKit::ChildProcessProxy::connectionDidClose): Deleted.
+ * Shared/ChildProcessProxy.h:
+
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::processWillShutDown):
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::processWillShutDown):
+ * UIProcess/Network/NetworkProcessProxy.h:
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::processWillShutDown):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+
+ * UIProcess/WebFrameProxy.cpp:
+ (WebKit::WebFrameProxy::webProcessWillShutDown):
+ (WebKit::WebFrameProxy::disconnect): Deleted.
+ * UIProcess/WebFrameProxy.h:
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::webProcessWillShutDown):
+ (WebKit::WebPageProxy::connectionDidClose): Deleted.
+ * UIProcess/WebPageProxy.h:
+
+ * UIProcess/WebProcessLifetimeTracker.cpp:
+ (WebKit::WebProcessLifetimeTracker::webProcessWillShutDown):
+ (WebKit::WebProcessLifetimeTracker::connectionDidClose): Deleted.
+ * UIProcess/WebProcessLifetimeTracker.h:
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::processWillShutDown):
+ (WebKit::WebProcessProxy::shutDown):
+ (WebKit::WebProcessProxy::removeWebPage):
+ (WebKit::WebProcessProxy::didClose):
+ (WebKit::WebProcessProxy::disconnectFramesFromPage):
+ (WebKit::WebProcessProxy::shouldTerminate):
+ (WebKit::WebProcessProxy::requestTermination):
+ (WebKit::WebProcessProxy::connectionDidClose): Deleted.
+ (WebKit::WebProcessProxy::disconnect): Deleted.
+ * UIProcess/WebProcessProxy.h:
+
+2015-05-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r184716.
</span><span class="cx">
</span><span class="cx"> 2015-05-21 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2SharedChildProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -159,13 +159,12 @@
</span><span class="cx"> m_processLauncher = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ChildProcessProxy::clearConnection()
</del><ins>+void ChildProcessProxy::shutDownProcess()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_connection)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Call this after the connection has been invalidated.
- connectionDidClose(*m_connection);
</del><ins>+ processWillShutDown(*m_connection);
</ins><span class="cx">
</span><span class="cx"> m_connection->invalidate();
</span><span class="cx"> m_connection = nullptr;
</span><span class="lines">@@ -175,8 +174,4 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ChildProcessProxy::connectionDidClose(IPC::Connection&)
-{
-}
-
</del><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2SharedChildProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/Shared/ChildProcessProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> bool sendMessage(std::unique_ptr<IPC::MessageEncoder>, unsigned messageSendFlags);
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- void clearConnection();
</del><ins>+ void shutDownProcess();
</ins><span class="cx"> void abortProcessLaunchIfNeeded();
</span><span class="cx">
</span><span class="cx"> // ProcessLauncher::Client
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) = 0;
</span><span class="cx"> virtual void connectionWillOpen(IPC::Connection&);
</span><del>- virtual void connectionDidClose(IPC::Connection&);
</del><ins>+ virtual void processWillShutDown(IPC::Connection&) = 0;
</ins><span class="cx">
</span><span class="cx"> Vector<std::pair<std::unique_ptr<IPC::MessageEncoder>, unsigned>> m_pendingMessages;
</span><span class="cx"> RefPtr<ProcessLauncher> m_processLauncher;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -72,6 +72,11 @@
</span><span class="cx"> platformGetLaunchOptions(launchOptions);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void DatabaseProcessProxy::processWillShutDown(IPC::Connection& connection)
+{
+ ASSERT_UNUSED(connection, this->connection() == &connection);
+}
+
</ins><span class="cx"> void DatabaseProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::MessageDecoder& decoder)
</span><span class="cx"> {
</span><span class="cx"> if (decoder.messageReceiverName() == Messages::DatabaseProcessProxy::messageReceiverName()) {
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -59,6 +59,7 @@
</span><span class="cx">
</span><span class="cx"> // ChildProcessProxy
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><ins>+ virtual void processWillShutDown(IPC::Connection&) override;
</ins><span class="cx">
</span><span class="cx"> // IPC::Connection::Client
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -95,6 +95,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkProcessProxy::processWillShutDown(IPC::Connection& connection)
+{
+ ASSERT_UNUSED(connection, this->connection() == &connection);
+}
+
</ins><span class="cx"> void NetworkProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> m_pendingConnectionReplies.append(reply);
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -84,6 +84,7 @@
</span><span class="cx"> // ChildProcessProxy
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><span class="cx"> virtual void connectionWillOpen(IPC::Connection&) override;
</span><ins>+ virtual void processWillShutDown(IPC::Connection&) override;
</ins><span class="cx">
</span><span class="cx"> void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
</span><span class="cx"> void networkProcessCrashedOrFailedToLaunch();
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessPluginsPluginProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -82,6 +82,11 @@
</span><span class="cx"> platformGetLaunchOptions(launchOptions, m_pluginProcessAttributes);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PluginProcessProxy::processWillShutDown(IPC::Connection& connection)
+{
+ ASSERT_UNUSED(connection, this->connection() == &connection);
+}
+
</ins><span class="cx"> // Asks the plug-in process to create a new connection to a web process. The connection identifier will be
</span><span class="cx"> // encoded in the given argument encoder and sent back to the connection of the given web process.
</span><span class="cx"> void PluginProcessProxy::getPluginProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply> reply)
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessPluginsPluginProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><span class="cx"> void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&, const PluginProcessAttributes&);
</span><ins>+ virtual void processWillShutDown(IPC::Connection&) override;
</ins><span class="cx">
</span><span class="cx"> void pluginProcessCrashedOrFailedToLaunch();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebFrameProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> WebProcessPool::statistics().wkFrameCount--;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebFrameProxy::disconnect()
</del><ins>+void WebFrameProxy::webProcessWillShutDown()
</ins><span class="cx"> {
</span><span class="cx"> m_page = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebFrameProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebFrameProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> uint64_t frameID() const { return m_frameID; }
</span><span class="cx"> WebPageProxy* page() const { return m_page; }
</span><span class="cx">
</span><del>- void disconnect();
</del><ins>+ void webProcessWillShutDown();
</ins><span class="cx">
</span><span class="cx"> bool isMainFrame() const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -3500,11 +3500,9 @@
</span><span class="cx"> m_webProcessLifetimeTracker.connectionWillOpen(connection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::connectionDidClose(IPC::Connection& connection)
</del><ins>+void WebPageProxy::webProcessWillShutDown()
</ins><span class="cx"> {
</span><del>- ASSERT_UNUSED(connection, &connection == m_process->connection());
-
- m_webProcessLifetimeTracker.connectionDidClose(connection);
</del><ins>+ m_webProcessLifetimeTracker.webProcessWillShutDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::processDidFinishLaunching()
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebPageProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx"> void didCancelCheckingText(uint64_t requestID);
</span><span class="cx">
</span><span class="cx"> void connectionWillOpen(IPC::Connection&);
</span><del>- void connectionDidClose(IPC::Connection&);
</del><ins>+ void webProcessWillShutDown();
</ins><span class="cx">
</span><span class="cx"> void processDidFinishLaunching();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebProcessLifetimeTrackercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> observer->addWebPage(m_webPageProxy);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessLifetimeTracker::connectionDidClose(IPC::Connection&)
</del><ins>+void WebProcessLifetimeTracker::webProcessWillShutDown()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(processIsRunning());
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebProcessLifetimeTrackerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessLifetimeTracker.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> void addObserver(WebProcessLifetimeObserver&);
</span><span class="cx">
</span><span class="cx"> void connectionWillOpen(IPC::Connection&);
</span><del>- void connectionDidClose(IPC::Connection&);
</del><ins>+ void webProcessWillShutDown();
</ins><span class="cx">
</span><span class="cx"> void pageWasInvalidated();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -147,9 +147,9 @@
</span><span class="cx"> page->connectionWillOpen(connection);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::connectionDidClose(IPC::Connection& connection)
</del><ins>+void WebProcessProxy::processWillShutDown(IPC::Connection& connection)
</ins><span class="cx"> {
</span><del>- ASSERT(this->connection() == &connection);
</del><ins>+ ASSERT_UNUSED(connection, this->connection() == &connection);
</ins><span class="cx">
</span><span class="cx"> for (const auto& callback : m_pendingFetchWebsiteDataCallbacks.values())
</span><span class="cx"> callback(WebsiteData());
</span><span class="lines">@@ -164,14 +164,14 @@
</span><span class="cx"> m_pendingDeleteWebsiteDataForOriginsCallbacks.clear();
</span><span class="cx">
</span><span class="cx"> for (auto& page : m_pageMap.values())
</span><del>- page->connectionDidClose(connection);
</del><ins>+ page->webProcessWillShutDown();
</ins><span class="cx">
</span><span class="cx"> releaseRemainingIconsForPageURLs();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::disconnect()
</del><ins>+void WebProcessProxy::shutDown()
</ins><span class="cx"> {
</span><del>- clearConnection();
</del><ins>+ shutDownProcess();
</ins><span class="cx">
</span><span class="cx"> if (m_webConnection) {
</span><span class="cx"> m_webConnection->invalidate();
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> copyValuesToVector(m_frameMap, frames);
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0, size = frames.size(); i < size; ++i)
</span><del>- frames[i]->disconnect();
</del><ins>+ frames[i]->webProcessWillShutDown();
</ins><span class="cx"> m_frameMap.clear();
</span><span class="cx">
</span><span class="cx"> if (m_downloadProxyMap)
</span><span class="lines">@@ -249,13 +249,13 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> if (state() == State::Running) {
</span><del>- // On iOS deploy a watchdog in the UI process, since the content may be suspended.
- // 30s should be sufficient for any outstanding activity to complete cleanly.
</del><ins>+ // On iOS deploy a watchdog in the UI process, since the child process may be suspended.
+ // If 30s is insufficient for any outstanding activity to complete cleanly, then it will be killed.
</ins><span class="cx"> connection()->terminateSoon(30);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- disconnect();
</del><ins>+ shutDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::addVisitedLinkProvider(VisitedLinkProvider& provider)
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> Vector<RefPtr<WebPageProxy>> pages;
</span><span class="cx"> copyValuesToVector(m_pageMap, pages);
</span><span class="cx">
</span><del>- disconnect();
</del><ins>+ shutDown();
</ins><span class="cx">
</span><span class="cx"> for (size_t i = 0, size = pages.size(); i < size; ++i)
</span><span class="cx"> pages[i]->processDidCrash();
</span><span class="lines">@@ -628,7 +628,7 @@
</span><span class="cx"> copyValuesToVector(m_frameMap, frames);
</span><span class="cx"> for (size_t i = 0, size = frames.size(); i < size; ++i) {
</span><span class="cx"> if (frames[i]->page() == page)
</span><del>- frames[i]->disconnect();
</del><ins>+ frames[i]->webProcessWillShutDown();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -663,8 +663,8 @@
</span><span class="cx"> {
</span><span class="cx"> shouldTerminate = canTerminateChildProcess();
</span><span class="cx"> if (shouldTerminate) {
</span><del>- // We know that the web process is going to terminate so disconnect it from the process pool.
- disconnect();
</del><ins>+ // We know that the web process is going to terminate so start shutting it down in the UI process.
+ shutDown();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx"> if (webConnection())
</span><span class="cx"> webConnection()->didClose();
</span><span class="cx">
</span><del>- disconnect();
</del><ins>+ shutDown();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessProxy::enableSuddenTermination()
</span></span></pre></div>
<a id="branchessafari6011322branchSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.h (184728 => 184729)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-05-21 19:37:50 UTC (rev 184728)
+++ branches/safari-601.1.32.2-branch/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-05-21 19:51:39 UTC (rev 184729)
</span><span class="lines">@@ -160,11 +160,11 @@
</span><span class="cx"> virtual void getLaunchOptions(ProcessLauncher::LaunchOptions&) override;
</span><span class="cx"> void platformGetLaunchOptions(ProcessLauncher::LaunchOptions&);
</span><span class="cx"> virtual void connectionWillOpen(IPC::Connection&) override;
</span><del>- virtual void connectionDidClose(IPC::Connection&) override;
</del><ins>+ virtual void processWillShutDown(IPC::Connection&) override;
</ins><span class="cx">
</span><span class="cx"> // Called when the web process has crashed or we know that it will terminate soon.
</span><span class="cx"> // Will potentially cause the WebProcessProxy object to be freed.
</span><del>- void disconnect();
</del><ins>+ void shutDown();
</ins><span class="cx">
</span><span class="cx"> // IPC message handlers.
</span><span class="cx"> void addBackForwardItem(uint64_t itemID, uint64_t pageID, const PageState&);
</span></span></pre>
</div>
</div>
</body>
</html>