<!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>[205817] 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/205817">205817</a></dd>
<dt>Author</dt> <dd>krollin@apple.com</dd>
<dt>Date</dt> <dd>2016-09-12 11:59:32 -0700 (Mon, 12 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Enhance Network logging
https://bugs.webkit.org/show_bug.cgi?id=161771
Reviewed by Antti Koivisto.
Modify current logging statements to follow a consistent pattern in
order to enhance readability and parsing.
Source/WebCore:
No new tests -- there are no tests for logging.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::prepareForLoadStart):
(WebCore::FrameLoader::checkLoadCompleteForThisFrame):
Source/WebKit2:
* NetworkProcess/Downloads/Download.cpp:
(WebKit::Download::didReceiveResponse):
(WebKit::Download::didReceiveData):
(WebKit::Download::didFinish):
(WebKit::Download::didFail):
(WebKit::Download::didCancel):
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):
(WebKit::NetworkResourceLoader::didFinishLoading):
(WebKit::NetworkResourceLoader::didFailLoading):
(WebKit::NetworkResourceLoader::continueWillSendRequest):
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoad):
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::willSendRequest):
(WebKit::WebResourceLoader::didReceiveResponse):
(WebKit::WebResourceLoader::didReceiveData):
(WebKit::WebResourceLoader::didFinishResourceLoad):
(WebKit::WebResourceLoader::didFailResourceLoad):
(WebKit::WebResourceLoader::didReceiveResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebCore/ChangeLog 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-12 Keith Rollin <krollin@apple.com>
+
+ Enhance Network logging
+ https://bugs.webkit.org/show_bug.cgi?id=161771
+
+ Reviewed by Antti Koivisto.
+
+ Modify current logging statements to follow a consistent pattern in
+ order to enhance readability and parsing.
+
+ No new tests -- there are no tests for logging.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::prepareForLoadStart):
+ (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+
</ins><span class="cx"> 2016-09-12 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash in com.apple.WebCore: WebCore::NavigatorGamepad::gamepadFromPlatformGamepad.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> #include "WKContentObservation.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - FrameLoader::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -1098,7 +1098,7 @@
</span><span class="cx">
</span><span class="cx"> void FrameLoader::prepareForLoadStart()
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Starting frame load, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("prepareForLoadStart: Starting frame load (frame = %p, main = %d)", &m_frame, m_frame.isMainFrame());
</ins><span class="cx">
</span><span class="cx"> m_progressTracker->progressStarted();
</span><span class="cx"> m_client.dispatchDidStartProvisionalLoad();
</span><span class="lines">@@ -2303,11 +2303,11 @@
</span><span class="cx">
</span><span class="cx"> AXObjectCache::AXLoadingEvent loadingEvent;
</span><span class="cx"> if (!error.isNull()) {
</span><del>- RELEASE_LOG_IF_ALLOWED("Finished frame load with error, frame = %p, main = %d, isTimeout = %d, isCancellation = %d, errorCode = %d", &m_frame, m_frame.isMainFrame(), error.isTimeout(), error.isCancellation(), error.errorCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("checkLoadCompleteForThisFrame: Finished frame load with error (frame = %p, main = %d, isTimeout = %d, isCancellation = %d, errorCode = %d)", &m_frame, m_frame.isMainFrame(), error.isTimeout(), error.isCancellation(), error.errorCode());
</ins><span class="cx"> m_client.dispatchDidFailLoad(error);
</span><span class="cx"> loadingEvent = AXObjectCache::AXLoadingFailed;
</span><span class="cx"> } else {
</span><del>- RELEASE_LOG_IF_ALLOWED("Finished frame load without error, frame = %p, main = %d", &m_frame, m_frame.isMainFrame());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("checkLoadCompleteForThisFrame: Finished frame load without error (frame = %p, main = %d)", &m_frame, m_frame.isMainFrame());
</ins><span class="cx"> #if ENABLE(DATA_DETECTION)
</span><span class="cx"> auto* document = m_frame.document();
</span><span class="cx"> if (m_frame.settings().dataDetectorTypes() != DataDetectorTypeNone && document) {
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebKit2/ChangeLog 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-09-12 Keith Rollin <krollin@apple.com>
+
+ Enhance Network logging
+ https://bugs.webkit.org/show_bug.cgi?id=161771
+
+ Reviewed by Antti Koivisto.
+
+ Modify current logging statements to follow a consistent pattern in
+ order to enhance readability and parsing.
+
+ * NetworkProcess/Downloads/Download.cpp:
+ (WebKit::Download::didReceiveResponse):
+ (WebKit::Download::didReceiveData):
+ (WebKit::Download::didFinish):
+ (WebKit::Download::didFail):
+ (WebKit::Download::didCancel):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ (WebKit::NetworkResourceLoader::didFinishLoading):
+ (WebKit::NetworkResourceLoader::didFailLoading):
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::willSendRequest):
+ (WebKit::WebResourceLoader::didReceiveResponse):
+ (WebKit::WebResourceLoader::didReceiveData):
+ (WebKit::WebResourceLoader::didFinishResourceLoad):
+ (WebKit::WebResourceLoader::didFailResourceLoad):
+ (WebKit::WebResourceLoader::didReceiveResource):
+
</ins><span class="cx"> 2016-09-09 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> WKThumbnailView should expose a mode where it can be reparented without resnapshotting
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/Download.cpp 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - Download::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -86,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didReceiveResponse(const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Download task (%llu) created", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Created (id = %llu)", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidReceiveResponse(response));
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +94,7 @@
</span><span class="cx"> void Download::didReceiveData(uint64_t length)
</span><span class="cx"> {
</span><span class="cx"> if (!m_hasReceivedData) {
</span><del>- RELEASE_LOG_IF_ALLOWED("Download task (%llu) started receiving data", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveData: Started receiving data (id = %llu)", downloadID().downloadID());
</ins><span class="cx"> m_hasReceivedData = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -134,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFinish()
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Download task (%llu) finished", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFinish: (id = %llu)", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> platformDidFinish();
</span><span class="cx">
</span><span class="lines">@@ -150,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didFail(const ResourceError& error, const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Download task (%llu) failed, isTimeout = %d, isCancellation = %d, errCode = %d",
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFail: (id = %llu, isTimeout = %d, isCancellation = %d, errCode = %d)",
</ins><span class="cx"> downloadID().downloadID(), error.isTimeout(), error.isCancellation(), error.errorCode());
</span><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidFail(error, resumeData));
</span><span class="lines">@@ -164,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> void Download::didCancel(const IPC::DataReference& resumeData)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Download task (%llu) canceled", downloadID().downloadID());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didCancel: (id = %llu)", downloadID().downloadID());
</ins><span class="cx">
</span><span class="cx"> send(Messages::DownloadProxy::DidCancel(resumeData));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -49,8 +49,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkResourceLoader::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -206,7 +205,7 @@
</span><span class="cx"> m_bufferedDataForCache = SharedBuffer::create();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RELEASE_LOG_IF_ALLOWED("Starting network resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("startNetworkLoad: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> NetworkLoadParameters parameters = m_parameters;
</span><span class="cx"> parameters.defersLoading = m_defersLoading;
</span><span class="lines">@@ -290,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> auto NetworkResourceLoader::didReceiveResponse(ResourceResponse&& receivedResponse) -> ShouldContinueDidReceiveResponse
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Received network resource response: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, httpStatusCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), receivedResponse.httpStatusCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, httpStatusCode = %d)", m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), receivedResponse.httpStatusCode());
</ins><span class="cx">
</span><span class="cx"> m_response = WTFMove(receivedResponse);
</span><span class="cx">
</span><span class="lines">@@ -322,7 +321,7 @@
</span><span class="cx"> if (isSynchronous())
</span><span class="cx"> m_synchronousLoadData->response = m_response;
</span><span class="cx"> else {
</span><del>- RELEASE_LOG_IF_ALLOWED("Sending didReceiveResponse message to the WebContent process: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Sending didReceiveResponse message to the WebContent process (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> send(Messages::WebResourceLoader::DidReceiveResponse(m_response, shouldWaitContinueDidReceiveResponse));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -334,11 +333,11 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (shouldContinueDidReceiveResponse) {
</span><del>- RELEASE_LOG_IF_ALLOWED("Should wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should wait for message from WebContent process before continuing resource load (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> return ShouldContinueDidReceiveResponse::Yes;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RELEASE_LOG_IF_ALLOWED("Should not wait for message from WebContent process before continuing resource load: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: Should not wait for message from WebContent process before continuing resource load (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx"> return ShouldContinueDidReceiveResponse::No;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -371,7 +370,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFinishLoading(double finishTime)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Finished loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFinishLoading: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (m_cacheEntryForValidation) {
</span><span class="lines">@@ -402,7 +401,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::didFailLoading(const ResourceError& error)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Failed loading network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, isTimeout = %d, isCancellation = %d, errCode = %d", this, m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), error.isTimeout(), error.isCancellation(), error.errorCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFailLoading: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d, isTimeout = %d, isCancellation = %d, errCode = %d)", m_parameters.webPageID, m_parameters.webFrameID, isMainResource(), isSynchronous(), error.isTimeout(), error.isCancellation(), error.errorCode());
</ins><span class="cx">
</span><span class="cx"> ASSERT(!error.isNull());
</span><span class="cx">
</span><span class="lines">@@ -448,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest)
</span><span class="cx"> {
</span><del>- RELEASE_LOG_IF_ALLOWED("Following redirect of network resource: loader = %p, pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d", this, static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("continueWillSendRequest: (pageID = %llu, frameID = %llu, isMainResource = %d, isSynchronous = %d)", static_cast<unsigned long long>(m_parameters.webPageID), static_cast<unsigned long long>(m_parameters.webFrameID), isMainResource(), isSynchronous());
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> if (m_isWaitingContinueWillSendRequestForCachedRedirect) {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -57,8 +57,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(...) RELEASE_LOG_ERROR_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
+#define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(loadParameters.sessionID.isAlwaysOnLoggingAllowed(), Network, "%p - WebLoaderStrategy::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> ASSERT((loadParameters.webPageID && loadParameters.webFrameID) || loadParameters.clientCredentialPolicy == ClientCredentialPolicy::CannotAskClientForCredentials);
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::ScheduleResourceLoad(loadParameters), 0)) {
</span><del>- RELEASE_LOG_ERROR_IF_ALLOWED("WebLoaderStrategy::scheduleLoad: Unable to schedule resource with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</del><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("scheduleLoad: Unable to schedule resource with the NetworkProcess (priority = %d, pageID = %llu, frameID = %llu)", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID));
</ins><span class="cx"> // We probably failed to schedule this load with the NetworkProcess because it had crashed.
</span><span class="cx"> // This load will never succeed so we will schedule it to fail asynchronously.
</span><span class="cx"> scheduleInternallyFailedLoad(resourceLoader);
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto webResourceLoader = WebResourceLoader::create(resourceLoader);
</span><del>- RELEASE_LOG_IF_ALLOWED("WebLoaderStrategy::scheduleLoad: Resource will be scheduled with the NetworkProcess with priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("scheduleLoad: Resource will be scheduled with the NetworkProcess (priority = %d, pageID = %llu, frameID = %llu, WebResourceLoader = %p)", static_cast<int>(resourceLoader.request().priority()), static_cast<unsigned long long>(loadParameters.webPageID), static_cast<unsigned long long>(loadParameters.webFrameID), webResourceLoader.ptr());
</ins><span class="cx"> m_webResourceLoaders.set(identifier, WTFMove(webResourceLoader));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (205816 => 205817)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-09-12 18:45:43 UTC (rev 205816)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-09-12 18:59:32 UTC (rev 205817)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-#define RELEASE_LOG_IF_ALLOWED(...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, __VA_ARGS__)
</del><ins>+#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - WebResourceLoader::" fmt, this, ##__VA_ARGS__)
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void WebResourceLoader::willSendRequest(ResourceRequest&& proposedRequest, ResourceResponse&& redirectResponse)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::willSendRequest to '%s'", proposedRequest.url().string().latin1().data());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::willSendRequest, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("willSendRequest");
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebResourceLoader> protectedThis(this);
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> void WebResourceLoader::didReceiveResponse(const ResourceResponse& response, bool needsContinueDidReceiveResponseMessage)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResponse for '%s'. Status %d.", m_coreLoader->url().string().latin1().data(), response.httpStatusCode());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveResponse, WebResourceLoader = %p, status = %d.", this, response.httpStatusCode());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResponse: (status = %d)", response.httpStatusCode());
</ins><span class="cx">
</span><span class="cx"> Ref<WebResourceLoader> protect(*this);
</span><span class="cx">
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> void WebResourceLoader::didReceiveData(const IPC::DataReference& data, int64_t encodedDataLength)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveData of size %lu for '%s'", data.size(), m_coreLoader->url().string().latin1().data());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveData, WebResourceLoader = %p, size = %lu", this, data.size());
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveData: (size = %lu)", data.size());
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle()) {
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> void WebResourceLoader::didFinishResourceLoad(double finishTime)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFinishResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didFinishResourceLoad, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFinishResourceLoad");
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle()) {
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> void WebResourceLoader::didFailResourceLoad(const ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didFailResourceLoad for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didFailResourceLoad, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didFailResourceLoad");
</ins><span class="cx">
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> if (QuickLookHandle* quickLookHandle = m_coreLoader->documentLoader()->quickLookHandle())
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> void WebResourceLoader::didReceiveResource(const ShareableResource::Handle& handle, double finishTime)
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "(WebProcess) WebResourceLoader::didReceiveResource for '%s'", m_coreLoader->url().string().latin1().data());
</span><del>- RELEASE_LOG_IF_ALLOWED("WebResourceLoader::didReceiveResource, WebResourceLoader = %p", this);
</del><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResource");
</ins><span class="cx">
</span><span class="cx"> RefPtr<SharedBuffer> buffer = handle.tryWrapInSharedBuffer();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>