<!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>[208333] branches/safari-602-branch/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/208333">208333</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-11-03 11:04:39 -0700 (Thu, 03 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/208286">r208286</a>. rdar://problem/28634857</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebCoreChangeLog">branches/safari-602-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebCoreloaderResourceLoaderh">branches/safari-602-branch/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageDiagnosticLoggingKeyscpp">branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebCorepageDiagnosticLoggingKeysh">branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.h</a></li>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r208286. rdar://problem/28634857
+
+ 2016-11-02 David Kilzer <ddkilzer@apple.com>
+
+ Add logging for "WebKit encountered an internal error" messages
+ <https://webkit.org/b/164272>
+ <rdar://problem/28546064>
+
+ Reviewed by Alex Christensen.
+
+ * page/DiagnosticLoggingKeys.cpp:
+ (WebCore::DiagnosticLoggingKeys::internalErrorKey):
+ (WebCore::DiagnosticLoggingKeys::invalidSessionIDKey):
+ (WebCore::DiagnosticLoggingKeys::createSharedBufferFailedKey):
+ (WebCore::DiagnosticLoggingKeys::synchronousMessageFailedKey):
+ - Add implementations for new key methods.
+
+ * page/DiagnosticLoggingKeys.h:
+ (WebCore::DiagnosticLoggingKeys::internalErrorKey):
+ (WebCore::DiagnosticLoggingKeys::invalidSessionIDKey):
+ (WebCore::DiagnosticLoggingKeys::createSharedBufferFailedKey):
+ (WebCore::DiagnosticLoggingKeys::synchronousMessageFailedKey):
+ - Add declarations for new key methods.
+
+2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r208101. rdar://problem/29053206
</span><span class="cx">
</span><span class="cx"> 2016-10-29 Youenn Fablet <youenn@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/loader/ResourceLoader.h (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/loader/ResourceLoader.h 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebCore/loader/ResourceLoader.h 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -145,6 +145,7 @@
</span><span class="cx"> void unschedule(WTF::SchedulePair&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ const Frame* frame() const { return m_frame.get(); }
</ins><span class="cx"> WEBCORE_EXPORT bool isAlwaysOnLoggingAllowed() const;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageDiagnosticLoggingKeyscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.cpp 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -233,6 +233,16 @@
</span><span class="cx"> return ASCIILiteral("inMemoryCache");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::internalErrorKey()
+{
+ return ASCIILiteral("internalError");
+}
+
+String DiagnosticLoggingKeys::invalidSessionIDKey()
+{
+ return ASCIILiteral("invalidSessionID");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::isAttachmentKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("isAttachment");
</span><span class="lines">@@ -288,6 +298,11 @@
</span><span class="cx"> return ASCIILiteral("cannotSuspendActiveDOMObjects");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::createSharedBufferFailedKey()
+{
+ return ASCIILiteral("createSharedBufferFailed");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::deltaKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("delta");
</span><span class="lines">@@ -443,6 +458,11 @@
</span><span class="cx"> return ASCIILiteral("svgDocument");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String DiagnosticLoggingKeys::synchronousMessageFailedKey()
+{
+ return ASCIILiteral("synchronousMessageFailed");
+}
+
</ins><span class="cx"> String DiagnosticLoggingKeys::uncacheableStatusCodeKey()
</span><span class="cx"> {
</span><span class="cx"> return ASCIILiteral("uncacheableStatusCode");
</span></span></pre></div>
<a id="branchessafari602branchSourceWebCorepageDiagnosticLoggingKeysh"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.h (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebCore/page/DiagnosticLoggingKeys.h 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> static String cachedResourceRevalidationKey();
</span><span class="cx"> static String canCacheKey();
</span><span class="cx"> static String cannotSuspendActiveDOMObjectsKey();
</span><ins>+ WEBCORE_EXPORT static String createSharedBufferFailedKey();
</ins><span class="cx"> WEBCORE_EXPORT static String deltaKey();
</span><span class="cx"> static String deniedByClientKey();
</span><span class="cx"> static String deviceMotionKey();
</span><span class="lines">@@ -56,6 +57,8 @@
</span><span class="cx"> static String httpsNoStoreKey();
</span><span class="cx"> static String imageKey();
</span><span class="cx"> static String inMemoryCacheKey();
</span><ins>+ WEBCORE_EXPORT static String internalErrorKey();
+ WEBCORE_EXPORT static String invalidSessionIDKey();
</ins><span class="cx"> WEBCORE_EXPORT static String isAttachmentKey();
</span><span class="cx"> WEBCORE_EXPORT static String isConditionalRequestKey();
</span><span class="cx"> static String isDisabledKey();
</span><span class="lines">@@ -120,6 +123,7 @@
</span><span class="cx"> WEBCORE_EXPORT static String successfulSpeculativeWarmupWithRevalidationKey();
</span><span class="cx"> WEBCORE_EXPORT static String successfulSpeculativeWarmupWithoutRevalidationKey();
</span><span class="cx"> static String svgDocumentKey();
</span><ins>+ WEBCORE_EXPORT static String synchronousMessageFailedKey();
</ins><span class="cx"> WEBCORE_EXPORT static String uncacheableStatusCodeKey();
</span><span class="cx"> static String underMemoryPressureKey();
</span><span class="cx"> WEBCORE_EXPORT static String unknownEntryRequestKey();
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-03 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r208286. rdar://problem/28634857
+
+ 2016-11-02 David Kilzer <ddkilzer@apple.com>
+
+ Add logging for "WebKit encountered an internal error" messages
+ <https://webkit.org/b/164272>
+ <rdar://problem/28546064>
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::loadResourceSynchronously):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResource):
+ - Add logging for various internalError() events.
+
</ins><span class="cx"> 2016-11-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r208255. rdar://problem/28962886
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "WebResourceLoaderMessages.h"
</span><span class="cx"> #include <WebCore/BlobDataFileReference.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><ins>+#include <WebCore/DiagnosticLoggingKeys.h>
</ins><span class="cx"> #include <WebCore/HTTPHeaderNames.h>
</span><span class="cx"> #include <WebCore/ProtectionSpace.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -217,6 +218,7 @@
</span><span class="cx"> if (!networkSession) {
</span><span class="cx"> WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
</span><span class="cx"> RELEASE_LOG_ERROR_IF_ALLOWED("startNetworkLoad: Attempted to create a NetworkLoad with a session that does not exist (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", sessionID=%" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, parameters.sessionID.sessionID());
</span><ins>+ NetworkProcess::singleton().logDiagnosticMessage(m_parameters.webPageID, WebCore::DiagnosticLoggingKeys::internalErrorKey(), WebCore::DiagnosticLoggingKeys::invalidSessionIDKey(), WebCore::ShouldSample::No);
</ins><span class="cx"> didFailLoading(internalError(request.url()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx"> #include "WebResourceLoader.h"
</span><span class="cx"> #include <WebCore/ApplicationCacheHost.h>
</span><span class="cx"> #include <WebCore/CachedResource.h>
</span><ins>+#include <WebCore/DiagnosticLoggingClient.h>
+#include <WebCore/DiagnosticLoggingKeys.h>
</ins><span class="cx"> #include <WebCore/Document.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/Frame.h>
</span><span class="lines">@@ -329,6 +331,8 @@
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</span><span class="cx"> RELEASE_LOG_ERROR_IF_ALLOWED("loadResourceSynchronously: failed sending synchronous network process message (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", loadParameters.webPageID, loadParameters.webFrameID, loadParameters.identifier);
</span><ins>+ if (auto* page = webPage->corePage())
+ page->diagnosticLoggingClient().logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::internalErrorKey(), WebCore::DiagnosticLoggingKeys::synchronousMessageFailedKey(), WebCore::ShouldSample::No);
</ins><span class="cx"> response = ResourceResponse();
</span><span class="cx"> error = internalError(request.url());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (208332 => 208333)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-11-03 18:04:33 UTC (rev 208332)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-11-03 18:04:39 UTC (rev 208333)
</span><span class="lines">@@ -35,7 +35,11 @@
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include <WebCore/ApplicationCacheHost.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><ins>+#include <WebCore/DiagnosticLoggingClient.h>
+#include <WebCore/DiagnosticLoggingKeys.h>
</ins><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><ins>+#include <WebCore/Frame.h>
+#include <WebCore/Page.h>
</ins><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceLoader.h>
</span><span class="cx"> #include <WebCore/SubresourceLoader.h>
</span><span class="lines">@@ -199,6 +203,10 @@
</span><span class="cx"> if (!buffer) {
</span><span class="cx"> LOG_ERROR("Unable to create buffer from ShareableResource sent from the network process.");
</span><span class="cx"> RELEASE_LOG_IF_ALLOWED("didReceiveResource: Unable to create SharedBuffer");
</span><ins>+ if (auto* frame = m_coreLoader->frame()) {
+ if (auto* page = frame->page())
+ page->diagnosticLoggingClient().logDiagnosticMessage(WebCore::DiagnosticLoggingKeys::internalErrorKey(), WebCore::DiagnosticLoggingKeys::createSharedBufferFailedKey(), WebCore::ShouldSample::No);
+ }
</ins><span class="cx"> m_coreLoader->didFail(internalError(m_coreLoader->request().url()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>