<!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>[171436] 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/171436">171436</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2014-07-22 23:37:16 -0700 (Tue, 22 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171303">r171303</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebContextcpp">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebContexth">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessWebContextSupplementh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContextSupplement.h</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 (171435 => 171436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 06:35:11 UTC (rev 171435)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-23 06:37:16 UTC (rev 171436)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2014-07-22 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><ins>+ Merge r171303.
+
+ 2014-07-21 Brady Eidson <beidson@apple.com>
+
+ DatabaseProcess doesn't relaunch after crashing.
+ <rdar://problem/17717343> and https://bugs.webkit.org/show_bug.cgi?id=135117
+
+ Reviewed by Alexey Proskuryakov.
+
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::didClose): Tell the WebContext.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::databaseProcessCrashed): Notify supplements, then clear the DatabaseProcessProxy pointer.
+ * UIProcess/WebContext.h:
+
+ * UIProcess/WebContextSupplement.h:
+ (WebKit::WebContextSupplement::processDidClose): Added. No users right now, but the patch in bug 135035 will need this.
+
+2014-07-22 Dana Burkart <dburkart@apple.com>
+
</ins><span class="cx"> Merge r171288.
</span><span class="cx">
</span><span class="cx"> 2014-07-20 Jeremy Jones <jeremyj@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (171435 => 171436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2014-07-23 06:35:11 UTC (rev 171435)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2014-07-23 06:37:16 UTC (rev 171436)
</span><span class="lines">@@ -80,6 +80,22 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessProxy::didClose(IPC::Connection*)
</span><span class="cx"> {
</span><ins>+ // The database process must have crashed or exited, so send any pending sync replies we might have.
+ while (!m_pendingConnectionReplies.isEmpty()) {
+ auto reply = m_pendingConnectionReplies.takeFirst();
+
+#if OS(DARWIN)
+ reply->send(IPC::Attachment(0, MACH_MSG_TYPE_MOVE_SEND));
+#elif USE(UNIX_DOMAIN_SOCKETS)
+ reply->send(IPC::Attachment());
+#else
+ notImplemented();
+#endif
+ }
+
+ // Tell WebContext to forget about this database process. This may cause us to be deleted.
+ m_webContext->databaseProcessCrashed(this);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcessProxy::didReceiveInvalidMessage(IPC::Connection*, IPC::StringReference messageReceiverName, IPC::StringReference messageName)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp (171435 => 171436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-23 06:35:11 UTC (rev 171435)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.cpp 2014-07-23 06:37:16 UTC (rev 171436)
</span><span class="lines">@@ -488,6 +488,17 @@
</span><span class="cx">
</span><span class="cx"> m_databaseProcess->getDatabaseProcessConnection(reply);
</span><span class="cx"> }
</span><ins>+
+void WebContext::databaseProcessCrashed(DatabaseProcessProxy* databaseProcessProxy)
+{
+ ASSERT(m_databaseProcess);
+ ASSERT(databaseProcessProxy == m_databaseProcess.get());
+
+ for (auto& supplement : m_supplements)
+ supplement.value->processDidClose(databaseProcessProxy);
+
+ m_databaseProcess = nullptr;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebContext::willStartUsingPrivateBrowsing()
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h (171435 => 171436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-07-23 06:35:11 UTC (rev 171435)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContext.h 2014-07-23 06:37:16 UTC (rev 171436)
</span><span class="lines">@@ -302,6 +302,7 @@
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void ensureDatabaseProcess();
</span><span class="cx"> void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
</span><ins>+ void databaseProcessCrashed(DatabaseProcessProxy*);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessWebContextSupplementh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContextSupplement.h (171435 => 171436)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContextSupplement.h 2014-07-23 06:35:11 UTC (rev 171435)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/WebContextSupplement.h 2014-07-23 06:37:16 UTC (rev 171436)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class DatabaseProcessProxy;
</ins><span class="cx"> class NetworkProcessProxy;
</span><span class="cx"> class WebContext;
</span><span class="cx"> class WebProcessProxy;
</span><span class="lines">@@ -55,6 +56,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ virtual void processDidClose(DatabaseProcessProxy*)
+ {
+ }
+
</ins><span class="cx"> virtual bool shouldTerminate(WebProcessProxy*) const
</span><span class="cx"> {
</span><span class="cx"> return true;
</span></span></pre>
</div>
</div>
</body>
</html>