<!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>[173122] branches/safari-600.1-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/173122">173122</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 14:55:32 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173118">r173118</a>. rdar://problem/16991213</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebInspectorProxycpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebPageProxycpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (173121 => 173122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-29 21:38:12 UTC (rev 173121)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-08-29 21:55:32 UTC (rev 173122)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-08-29 Lucas Forschler <lforschler@apple.com>
+
+ Merge r173118
+
+ 2014-08-29 Alexey Proskuryakov <ap@apple.com>
+
+ WebPageProxy::close() is a no-op for terminated processes
+ https://bugs.webkit.org/show_bug.cgi?id=136378
+ Related to <rdar://problem/16991213> and to <rdar://problem/17095600>
+
+ Reviewed by Brady Eidson.
+
+ Also fixes issues that got uncovered after making close() work.
+
+ * UIProcess/WebInspectorProxy.cpp: (WebKit::WebInspectorProxy::invalidate): Don't
+ close the page, because it makes no sense, and causes an assertion now. Previosly,
+ this was OK because the page was invalid already, and close() was a no-op.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::~WebPageProxy): Added some assertions to catch invalidation
+ issues earlier.
+ (WebKit::WebPageProxy::reattachToWebProcess): Make it an invariant that a page's
+ process always has a message receiver for it, until close() removes it.
+ (WebKit::WebPageProxy::close): Make this function work for all open pages, whether
+ they have a page or not.
+ (WebKit::WebPageProxy::processDidFinishLaunching): Added an asserion that process
+ agrees about its state.
+ (WebKit::WebPageProxy::resetStateAfterProcessExited): Don't remove a message receiver,
+ we now only do this in reattach or close.
+
</ins><span class="cx"> 2014-08-28 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r173093
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (173121 => 173122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-08-29 21:38:12 UTC (rev 173121)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2014-08-29 21:55:32 UTC (rev 173122)
</span><span class="lines">@@ -163,8 +163,6 @@
</span><span class="cx">
</span><span class="cx"> m_page->process().removeMessageReceiver(Messages::WebInspectorProxy::messageReceiverName(), m_page->pageID());
</span><span class="cx">
</span><del>- m_page->close();
-
</del><span class="cx"> didClose();
</span><span class="cx">
</span><span class="cx"> m_page = 0;
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp (173121 => 173122)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-29 21:38:12 UTC (rev 173121)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-08-29 21:55:32 UTC (rev 173122)
</span><span class="lines">@@ -425,6 +425,12 @@
</span><span class="cx">
</span><span class="cx"> WebPageProxy::~WebPageProxy()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_process->webPage(m_pageID) != this);
+#if !ASSERT_DISABLED
+ for (WebPageProxy* page : m_process->pages())
+ ASSERT(page != this);
+#endif
+
</ins><span class="cx"> if (!m_isClosed)
</span><span class="cx"> close();
</span><span class="cx">
</span><span class="lines">@@ -546,6 +552,7 @@
</span><span class="cx">
</span><span class="cx"> m_isValid = true;
</span><span class="cx"> m_process->removeWebPage(m_pageID);
</span><ins>+ m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</ins><span class="cx">
</span><span class="cx"> if (m_process->context().processModel() == ProcessModelSharedSecondaryProcess)
</span><span class="cx"> m_process = m_process->context().ensureSharedWebProcess();
</span><span class="lines">@@ -650,7 +657,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::close()
</span><span class="cx"> {
</span><del>- if (!isValid())
</del><ins>+ if (m_isClosed)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isClosed = true;
</span><span class="lines">@@ -3098,6 +3105,8 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::processDidFinishLaunching()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_process->state() == WebProcessProxy::State::Running);
+
</ins><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_userContentController->addProcess(m_process.get());
</span><span class="cx"> m_visitedLinkProvider->addProcess(m_process.get());
</span><span class="lines">@@ -4424,8 +4433,6 @@
</span><span class="cx"> m_visitedLinkProvider->removeProcess(m_process.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> m_activityToken = nullptr;
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>