<!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>[208307] trunk/Source</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/208307">208307</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2016-11-02 15:12:19 -0700 (Wed, 02 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bug 164333: Add logging for "WebKit encountered an internal error" messages due to Network process crashes
<https://webkit.org/b/164333>
<rdar://problem/29072727>
Reviewed by Alex Christensen.
Source/WebCore:
* page/DiagnosticLoggingKeys.cpp:
(WebCore::DiagnosticLoggingKeys::networkProcessCrashedKey):
- Add implementation for new key method.
* page/DiagnosticLoggingKeys.h:
(WebCore::DiagnosticLoggingKeys::networkProcessCrashedKey):
- Add declaration for new key method.
Source/WebKit2:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::logDiagnosticMessageForNetworkProcessCrash):
Add private method to log diagnostic message.
(WebKit::WebProcess::networkProcessConnectionClosed):
Call logDiagnosticMessageForNetworkProcessCrash().
* WebProcess/WebProcess.h:
(WebKit::WebProcess::logDiagnosticMessageForNetworkProcessCrash):
Declare new method.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeyscpp">trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDiagnosticLoggingKeysh">trunk/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-02 David Kilzer <ddkilzer@apple.com>
+
+ Bug 164333: Add logging for "WebKit encountered an internal error" messages due to Network process crashes
+ <https://webkit.org/b/164333>
+ <rdar://problem/29072727>
+
+ Reviewed by Alex Christensen.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::networkProcessCrashedKey):
+ - Add implementation for new key method.
+ * page/DiagnosticLoggingKeys.h:
+ (WebCore::DiagnosticLoggingKeys::networkProcessCrashedKey):
+ - Add declaration for new key method.
+
</ins><span class="cx"> 2016-11-02 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> The GC should be in a thread
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -133,6 +133,11 @@
</span><span class="cx"> return ASCIILiteral("network");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::networkProcessCrashedKey()
+{
+ return ASCIILiteral("networkProcessCrashed");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::neverSeenBeforeKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("neverSeenBefore");
</span></span></pre></div>
<a id="trunkSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DiagnosticLoggingKeys.h (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebCore/page/DiagnosticLoggingKeys.h 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String needsRevalidationKey();
</span><span class="cx"> WEBCORE_EXPORT static String networkCacheKey();
</span><span class="cx"> static String networkKey();
</span><ins>+ WEBCORE_EXPORT static String networkProcessCrashedKey();
</ins><span class="cx"> WEBCORE_EXPORT static String neverSeenBeforeKey();
</span><span class="cx"> static String noCacheKey();
</span><span class="cx"> static String noCurrentHistoryItemKey();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-11-02 David Kilzer <ddkilzer@apple.com>
+
+ Bug 164333: Add logging for "WebKit encountered an internal error" messages due to Network process crashes
+ <https://webkit.org/b/164333>
+ <rdar://problem/29072727>
+
+ Reviewed by Alex Christensen.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::logDiagnosticMessageForNetworkProcessCrash):
+ Add private method to log diagnostic message.
+ (WebKit::WebProcess::networkProcessConnectionClosed):
+ Call logDiagnosticMessageForNetworkProcessCrash().
+ * WebProcess/WebProcess.h:
+ (WebKit::WebProcess::logDiagnosticMessageForNetworkProcessCrash):
+ Declare new method.
+
</ins><span class="cx"> 2016-11-02 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove Battery Status API from the tree
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -74,6 +74,8 @@
</span><span class="cx"> #include <WebCore/DNS.h>
</span><span class="cx"> #include <WebCore/DatabaseManager.h>
</span><span class="cx"> #include <WebCore/DatabaseTracker.h>
</span><ins>+#include <WebCore/DiagnosticLoggingClient.h>
+#include <WebCore/DiagnosticLoggingKeys.h>
</ins><span class="cx"> #include <WebCore/FontCache.h>
</span><span class="cx"> #include <WebCore/FontCascade.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="lines">@@ -1081,6 +1083,26 @@
</span><span class="cx"> return *m_networkProcessConnection;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::logDiagnosticMessageForNetworkProcessCrash()
+{
+ WebCore::Page* page = nullptr;
+
+ if (auto* webPage = focusedWebPage())
+ page = webPage->corePage();
+
+ if (!page) {
+ for (auto& webPage : m_pageMap.values()) {
+ if (auto* corePage = webPage->corePage()) {
+ page = corePage;
+ break;
+ }
+ }
+ }
+
+ if (page)
+ page->diagnosticLoggingClient().logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::internalErrorKey(), WebCore::DiagnosticLoggingKeys::networkProcessCrashedKey(), WebCore::ShouldSample::No);
+}
+
</ins><span class="cx"> void WebProcess::networkProcessConnectionClosed(NetworkProcessConnection* connection)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_networkProcessConnection);
</span><span class="lines">@@ -1087,7 +1109,9 @@
</span><span class="cx"> ASSERT_UNUSED(connection, m_networkProcessConnection == connection);
</span><span class="cx">
</span><span class="cx"> m_networkProcessConnection = nullptr;
</span><del>-
</del><ins>+
+ logDiagnosticMessageForNetworkProcessCrash();
+
</ins><span class="cx"> m_webLoaderStrategy.networkProcessCrashed();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (208306 => 208307)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-11-02 22:01:04 UTC (rev 208306)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-11-02 22:12:19 UTC (rev 208307)
</span><span class="lines">@@ -307,6 +307,8 @@
</span><span class="cx"> void ensureAutomationSessionProxy(const String& sessionIdentifier);
</span><span class="cx"> void destroyAutomationSessionProxy();
</span><span class="cx">
</span><ins>+ void logDiagnosticMessageForNetworkProcessCrash();
+
</ins><span class="cx"> // ChildProcess
</span><span class="cx"> void initializeProcess(const ChildProcessInitializationParameters&) override;
</span><span class="cx"> void initializeProcessName(const ChildProcessInitializationParameters&) override;
</span></span></pre>
</div>
</div>
</body>
</html>