<!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>[215065] 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/215065">215065</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-06 15:58:08 -0700 (Thu, 06 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Only Capture Extra Network Load Metrics when there is a Web Inspector Frontend
https://bugs.webkit.org/show_bug.cgi?id=170525
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-04-06
Reviewed by Youenn Fablet.
Source/WebCore:
Covered by existing tests that when Web Inspector is open we enable collecting the extra data.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::firstFrontendCreated):
(WebCore::InspectorInstrumentation::lastFrontendDeleted):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::frontendCreated):
(WebCore::InspectorInstrumentation::frontendDeleted):
When the first frontend is created enable a new loader strategy to
collect extra network load metrics. When the last frontend is closed
disable the extra metrics.
* loader/LoaderStrategy.h:
* platform/PlatformStrategies.h:
New load strategy to enable/disable new metrics.
Source/WebKit:
* WebCoreSupport/WebResourceLoadScheduler.h:
Source/WebKit2:
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
Only collect extra metrics if the WebProcess this load is for has enabled
collecting extra metrics.
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::setCaptureExtraNetworkLoadMetricsEnabled):
* WebProcess/Network/WebLoaderStrategy.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled):
* NetworkProcess/NetworkConnectionToWebProcess.h:
(WebKit::NetworkConnectionToWebProcess::captureExtraNetworkLoadMetricsEnabled):
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
New bool state toggled through the loader policy.
* NetworkProcess/NetworkDataTask.cpp:
(WebKit::NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkDataTask.h:
(WebKit::NetworkDataTaskClient::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
(WebKit::NetworkLoadClient::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics):
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
Default handling for network loads is to not include extra data. Thread
client messages back from the NetworkLoads / SpeculativeLoads to check
the NetworkConnectionToWebProcess state on whether or not we should collect
extra metrics.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationcpp">trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreloaderLoaderStrategyh">trunk/Source/WebCore/loader/LoaderStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformStrategiesh">trunk/Source/WebCore/platform/PlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadClienth">trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebCore/ChangeLog 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Only Capture Extra Network Load Metrics when there is a Web Inspector Frontend
+ https://bugs.webkit.org/show_bug.cgi?id=170525
+
+ Reviewed by Youenn Fablet.
+
+ Covered by existing tests that when Web Inspector is open we enable collecting the extra data.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::firstFrontendCreated):
+ (WebCore::InspectorInstrumentation::lastFrontendDeleted):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::frontendCreated):
+ (WebCore::InspectorInstrumentation::frontendDeleted):
+ When the first frontend is created enable a new loader strategy to
+ collect extra network load metrics. When the last frontend is closed
+ disable the extra metrics.
+
+ * loader/LoaderStrategy.h:
+ * platform/PlatformStrategies.h:
+ New load strategy to enable/disable new metrics.
+
+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=16531
</span><span class="cx"> <rdar://problem/5712895>
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -51,10 +51,12 @@
</span><span class="cx"> #include "InspectorTimelineAgent.h"
</span><span class="cx"> #include "InspectorWorkerAgent.h"
</span><span class="cx"> #include "InstrumentingAgents.h"
</span><ins>+#include "LoaderStrategy.h"
</ins><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "PageDebuggerAgent.h"
</span><span class="cx"> #include "PageHeapAgent.h"
</span><span class="cx"> #include "PageRuntimeAgent.h"
</span><ins>+#include "PlatformStrategies.h"
</ins><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="cx"> #include "ScriptController.h"
</span><span class="lines">@@ -94,6 +96,16 @@
</span><span class="cx">
</span><span class="cx"> int InspectorInstrumentation::s_frontendCounter = 0;
</span><span class="cx">
</span><ins>+void InspectorInstrumentation::firstFrontendCreated()
+{
+ platformStrategies()->loaderStrategy()->setCaptureExtraNetworkLoadMetricsEnabled(true);
+}
+
+void InspectorInstrumentation::lastFrontendDeleted()
+{
+ platformStrategies()->loaderStrategy()->setCaptureExtraNetworkLoadMetricsEnabled(false);
+}
+
</ins><span class="cx"> static void didScheduleAsyncCall(InstrumentingAgents& instrumentingAgents, AsyncCallType type, int callbackId, ScriptExecutionContext& context, bool singleShot)
</span><span class="cx"> {
</span><span class="cx"> if (InspectorDebuggerAgent* debuggerAgent = instrumentingAgents.inspectorDebuggerAgent()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -249,9 +249,13 @@
</span><span class="cx"> static void layerTreeDidChange(Page*);
</span><span class="cx"> static void renderLayerDestroyed(Page*, const RenderLayer&);
</span><span class="cx">
</span><del>- static void frontendCreated() { s_frontendCounter += 1; }
- static void frontendDeleted() { s_frontendCounter -= 1; }
</del><ins>+ static void frontendCreated();
+ static void frontendDeleted();
</ins><span class="cx"> static bool hasFrontends() { return s_frontendCounter; }
</span><ins>+
+ static void firstFrontendCreated();
+ static void lastFrontendDeleted();
+
</ins><span class="cx"> static bool consoleAgentEnabled(ScriptExecutionContext*);
</span><span class="cx"> static bool timelineAgentEnabled(ScriptExecutionContext*);
</span><span class="cx"> static bool replayAgentEnabled(ScriptExecutionContext*);
</span><span class="lines">@@ -1346,4 +1350,20 @@
</span><span class="cx"> return workerGlobalScope.inspectorController().m_instrumentingAgents;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void InspectorInstrumentation::frontendCreated()
+{
+ s_frontendCounter++;
+
+ if (s_frontendCounter == 1)
+ InspectorInstrumentation::firstFrontendCreated();
+}
+
+inline void InspectorInstrumentation::frontendDeleted()
+{
+ s_frontendCounter--;
+
+ if (!s_frontendCounter)
+ InspectorInstrumentation::lastFrontendDeleted();
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/LoaderStrategy.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/LoaderStrategy.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebCore/loader/LoaderStrategy.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -63,6 +63,8 @@
</span><span class="cx">
</span><span class="cx"> virtual void storeDerivedDataToCache(const SHA1::Digest& bodyKey, const String& type, const String& partition, WebCore::SharedBuffer&) = 0;
</span><span class="cx">
</span><ins>+ virtual void setCaptureExtraNetworkLoadMetricsEnabled(bool) = 0;
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual ~LoaderStrategy();
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformStrategies.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformStrategies.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebCore/platform/PlatformStrategies.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef PlatformStrategies_h
-#define PlatformStrategies_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -88,5 +87,3 @@
</span><span class="cx"> WEBCORE_EXPORT void setPlatformStrategies(PlatformStrategies*);
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // PlatformStrategies_h
</del></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit/ChangeLog 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Only Capture Extra Network Load Metrics when there is a Web Inspector Frontend
+ https://bugs.webkit.org/show_bug.cgi?id=170525
+
+ Reviewed by Youenn Fablet.
+
+ * WebCoreSupport/WebResourceLoadScheduler.h:
+
</ins><span class="cx"> 2017-04-05 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Invalid address specified to RtlValidateHeap at std::ctype<char>::_Tidy() when finishing MiniBrowser
</span></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -58,6 +58,8 @@
</span><span class="cx">
</span><span class="cx"> void storeDerivedDataToCache(const SHA1::Digest&, const String&, const String&, WebCore::SharedBuffer&) override { }
</span><span class="cx">
</span><ins>+ void setCaptureExtraNetworkLoadMetricsEnabled(bool) override { }
+
</ins><span class="cx"> bool isSerialLoadingEnabled() const { return m_isSerialLoadingEnabled; }
</span><span class="cx"> void setSerialLoadingEnabled(bool b) { m_isSerialLoadingEnabled = b; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Only Capture Extra Network Load Metrics when there is a Web Inspector Frontend
+ https://bugs.webkit.org/show_bug.cgi?id=170525
+
+ Reviewed by Youenn Fablet.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didFinishCollectingMetrics:]):
+ Only collect extra metrics if the WebProcess this load is for has enabled
+ collecting extra metrics.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::setCaptureExtraNetworkLoadMetricsEnabled):
+ * WebProcess/Network/WebLoaderStrategy.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ (WebKit::NetworkConnectionToWebProcess::captureExtraNetworkLoadMetricsEnabled):
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ New bool state toggled through the loader policy.
+
+ * NetworkProcess/NetworkDataTask.cpp:
+ (WebKit::NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/NetworkDataTask.h:
+ (WebKit::NetworkDataTaskClient::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ (WebKit::NetworkLoadClient::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.h:
+ Default handling for network loads is to not include extra data. Thread
+ client messages back from the NetworkLoads / SpeculativeLoads to check
+ the NetworkConnectionToWebProcess state on whether or not we should collect
+ extra metrics.
+
+2017-04-06 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Show all headers in the Request Headers section of the Resource details sidebar
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=16531
</span><span class="cx"> <rdar://problem/5712895>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -386,6 +386,11 @@
</span><span class="cx"> NetworkCache::singleton().storeData(dataKey, data.data(), data.size());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
+{
+ m_captureExtraNetworkLoadMetricsEnabled = enabled;
+}
+
</ins><span class="cx"> void NetworkConnectionToWebProcess::ensureLegacyPrivateBrowsingSession()
</span><span class="cx"> {
</span><span class="cx"> NetworkProcess::singleton().ensurePrivateBrowsingSession(SessionID::legacyPrivateSessionID());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">
</span><span class="cx"> void didCleanupResourceLoader(NetworkResourceLoader&);
</span><span class="cx">
</span><ins>+ bool captureExtraNetworkLoadMetricsEnabled() const { return m_captureExtraNetworkLoadMetricsEnabled; }
+
</ins><span class="cx"> RefPtr<WebCore::BlobDataFileReference> getBlobDataFileReferenceForPath(const String& path);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -105,6 +107,8 @@
</span><span class="cx">
</span><span class="cx"> void storeDerivedDataToCache(const WebKit::NetworkCache::DataKey&, const IPC::DataReference&);
</span><span class="cx">
</span><ins>+ void setCaptureExtraNetworkLoadMetricsEnabled(bool);
+
</ins><span class="cx"> void createSocketStream(WebCore::URL&&, WebCore::SessionID, String cachePartition, uint64_t);
</span><span class="cx"> void destroySocketStream(uint64_t);
</span><span class="cx">
</span><span class="lines">@@ -123,6 +127,8 @@
</span><span class="cx"> #if USE(LIBWEBRTC)
</span><span class="cx"> RefPtr<NetworkRTCProvider> m_rtcProvider;
</span><span class="cx"> #endif
</span><ins>+
+ bool m_captureExtraNetworkLoadMetricsEnabled { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx">
</span><span class="cx"> StoreDerivedDataToCache(WebKit::NetworkCache::DataKey key, IPC::DataReference data)
</span><span class="cx">
</span><ins>+ SetCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
+
</ins><span class="cx"> CreateSocketStream(WebCore::URL url, WebCore::SessionID sessionID, String cachePartition, uint64_t identifier)
</span><span class="cx">
</span><span class="cx"> EnsureLegacyPrivateBrowsingSession()
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -110,6 +110,11 @@
</span><span class="cx"> m_client->didReceiveResponseNetworkSession(WTFMove(response), WTFMove(completionHandler));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool NetworkDataTask::shouldCaptureExtraNetworkLoadMetrics() const
+{
+ return m_client->shouldCaptureExtraNetworkLoadMetrics();
+}
+
</ins><span class="cx"> void NetworkDataTask::failureTimerFired()
</span><span class="cx"> {
</span><span class="cx"> RefPtr<NetworkDataTask> protectedThis(this);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -69,6 +69,8 @@
</span><span class="cx"> virtual void wasBlocked() = 0;
</span><span class="cx"> virtual void cannotShowURL() = 0;
</span><span class="cx">
</span><ins>+ virtual bool shouldCaptureExtraNetworkLoadMetrics() const { return false; }
+
</ins><span class="cx"> void didCompleteWithError(const WebCore::ResourceError& error)
</span><span class="cx"> {
</span><span class="cx"> WebCore::NetworkLoadMetrics emptyMetrics;
</span><span class="lines">@@ -90,6 +92,7 @@
</span><span class="cx"> virtual void invalidateAndCancel() = 0;
</span><span class="cx">
</span><span class="cx"> void didReceiveResponse(WebCore::ResourceResponse&&, ResponseCompletionHandler&&);
</span><ins>+ bool shouldCaptureExtraNetworkLoadMetrics() const;
</ins><span class="cx">
</span><span class="cx"> enum class State {
</span><span class="cx"> Running,
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -233,6 +233,13 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+bool NetworkLoad::shouldCaptureExtraNetworkLoadMetrics() const
+{
+ return m_client.get().shouldCaptureExtraNetworkLoadMetrics();
+}
+#endif
+
</ins><span class="cx"> NetworkLoadClient::ShouldContinueDidReceiveResponse NetworkLoad::sharedDidReceiveResponse(ResourceResponse&& response)
</span><span class="cx"> {
</span><span class="cx"> response.setSource(ResourceResponse::Source::Network);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -76,6 +76,8 @@
</span><span class="cx"> void setSuggestedFilename(const String&);
</span><span class="cx"> void setPendingDownload(PendingDownload&);
</span><span class="cx"> DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); }
</span><ins>+
+ bool shouldCaptureExtraNetworkLoadMetrics() const final;
</ins><span class="cx"> #else
</span><span class="cx"> WebCore::ResourceHandle* handle() const { return m_handle.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> virtual void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) = 0;
</span><span class="cx"> virtual void didFinishLoading(const WebCore::NetworkLoadMetrics&) = 0;
</span><span class="cx"> virtual void didFailLoading(const WebCore::ResourceError&) = 0;
</span><ins>+ virtual bool shouldCaptureExtraNetworkLoadMetrics() const { return false; }
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -709,4 +709,9 @@
</span><span class="cx"> return sessionID().isAlwaysOnLoggingAllowed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool NetworkResourceLoader::shouldCaptureExtraNetworkLoadMetrics() const
+{
+ return m_connection->captureExtraNetworkLoadMetricsEnabled();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> void didReceiveBuffer(Ref<WebCore::SharedBuffer>&&, int reportedEncodedDataLength) override;
</span><span class="cx"> void didFinishLoading(const WebCore::NetworkLoadMetrics&) override;
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><ins>+ bool shouldCaptureExtraNetworkLoadMetrics() const override;
</ins><span class="cx">
</span><span class="cx"> void convertToDownload(DownloadID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -156,6 +156,13 @@
</span><span class="cx"> m_completionHandler(WTFMove(m_cacheEntry));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+bool SpeculativeLoad::shouldCaptureExtraNetworkLoadMetrics() const
+{
+ return m_networkLoad->shouldCaptureExtraNetworkLoadMetrics();
+}
+#endif
+
</ins><span class="cx"> } // namespace NetworkCache
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -64,6 +64,10 @@
</span><span class="cx"> void didFinishLoading(const WebCore::NetworkLoadMetrics&) override;
</span><span class="cx"> void didFailLoading(const WebCore::ResourceError&) override;
</span><span class="cx">
</span><ins>+#if USE(NETWORK_SESSION)
+ bool shouldCaptureExtraNetworkLoadMetrics() const override;
+#endif
+
</ins><span class="cx"> void didComplete();
</span><span class="cx">
</span><span class="cx"> GlobalFrameID m_frameID;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -299,20 +299,23 @@
</span><span class="cx"> networkLoadMetrics.responseStart = Seconds(responseStartInterval);
</span><span class="cx"> networkLoadMetrics.responseEnd = Seconds(responseEndInterval);
</span><span class="cx"> networkLoadMetrics.markComplete();
</span><ins>+ networkLoadMetrics.protocol = String(m.networkProtocolName);
</ins><span class="cx">
</span><del>- networkLoadMetrics.protocol = String(m.networkProtocolName);
- networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
</del><ins>+ if (networkDataTask->shouldCaptureExtraNetworkLoadMetrics()) {
+ networkLoadMetrics.priority = toNetworkLoadPriority(task.priority);
+
</ins><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
</span><del>- networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
- if ([m respondsToSelector:@selector(_connectionIdentifier)])
- networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
</del><ins>+ networkLoadMetrics.remoteAddress = String(m._remoteAddressAndPort);
+ if ([m respondsToSelector:@selector(_connectionIdentifier)])
+ networkLoadMetrics.connectionIdentifier = String([m._connectionIdentifier UUIDString]);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- __block WebCore::HTTPHeaderMap requestHeaders;
- [m.request.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSString *value, BOOL *) {
- requestHeaders.set(String(name), String(value));
- }];
- networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
</del><ins>+ __block WebCore::HTTPHeaderMap requestHeaders;
+ [m.request.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(NSString *name, NSString *value, BOOL *) {
+ requestHeaders.set(String(name), String(value));
+ }];
+ networkLoadMetrics.requestHeaders = WTFMove(requestHeaders);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -398,4 +398,9 @@
</span><span class="cx"> WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::StoreDerivedDataToCache(key, dataReference), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebLoaderStrategy::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
+{
+ WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::SetCaptureExtraNetworkLoadMetricsEnabled(enabled), 0);
+}
+
</ins><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (215064 => 215065)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2017-04-06 22:39:15 UTC (rev 215064)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2017-04-06 22:58:08 UTC (rev 215065)
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx">
</span><span class="cx"> void storeDerivedDataToCache(const SHA1::Digest& bodyHash, const String& type, const String& partition, WebCore::SharedBuffer&) override;
</span><span class="cx">
</span><ins>+ void setCaptureExtraNetworkLoadMetricsEnabled(bool) override;
+
</ins><span class="cx"> WebResourceLoader* webResourceLoaderForIdentifier(ResourceLoadIdentifier identifier) const { return m_webResourceLoaders.get(identifier); }
</span><span class="cx"> RefPtr<WebCore::NetscapePlugInStreamLoader> schedulePluginStreamLoad(WebCore::Frame&, WebCore::NetscapePlugInStreamLoaderClient&, const WebCore::ResourceRequest&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>