<!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>[213917] 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/213917">213917</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-14 11:19:47 -0700 (Tue, 14 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: More accurate Resource Timing data in Web Inspector
https://bugs.webkit.org/show_bug.cgi?id=169577
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2017-03-14
Reviewed by Youenn Fablet.
Source/WebCore:
* inspector/InspectorNetworkAgent.h:
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::didFinishLoading):
Use the ResourceLoader to get the start time that responseEnd is relative to
so we can send the more accurate responseEnd when available.
* inspector/InspectorInstrumentation.cpp:
(WebCore::InspectorInstrumentation::didFinishLoadingImpl):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::didFinishLoading):
* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::validatePreflightResponse):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::finishedLoading):
* loader/ResourceLoadNotifier.cpp:
(WebCore::ResourceLoadNotifier::didFinishLoad):
(WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
(WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
* loader/ResourceLoadNotifier.h:
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didFinishLoading):
Pass ResourceLoader through to Web Inspector in didFinishLoading.
* platform/network/cocoa/NetworkLoadMetrics.mm:
(WebCore::copyTimingData):
The differences from the reference start are in Seconds, not milliseconds.
Source/WebInspectorUI:
* UserInterface/Models/ResourceTimingData.js:
(WebInspector.ResourceTimingData.prototype.get requestStart):
(WebInspector.ResourceTimingData.prototype.get responseStart):
Fallback to the startTime if available instead of using the
inaccurate WebContentProcess gathered timestamps.
(WebInspector.ResourceTimingData.prototype.markResponseEndTime):
Verify responseEnd compared to other times we may have.</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="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgenth">trunk/Source/WebCore/inspector/InspectorNetworkAgent.h</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadNotifiercpp">trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadNotifierh">trunk/Source/WebCore/loader/ResourceLoadNotifier.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaNetworkLoadMetricsmm">trunk/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm</a></li>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceModelsResourceTimingDatajs">trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimingData.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/ChangeLog 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2017-03-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: More accurate Resource Timing data in Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=169577
+
+ Reviewed by Youenn Fablet.
+
+ * inspector/InspectorNetworkAgent.h:
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::didFinishLoading):
+ Use the ResourceLoader to get the start time that responseEnd is relative to
+ so we can send the more accurate responseEnd when available.
+
+ * inspector/InspectorInstrumentation.cpp:
+ (WebCore::InspectorInstrumentation::didFinishLoadingImpl):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::didFinishLoading):
+ * loader/CrossOriginPreflightChecker.cpp:
+ (WebCore::CrossOriginPreflightChecker::validatePreflightResponse):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::finishedLoading):
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::didFinishLoad):
+ (WebCore::ResourceLoadNotifier::dispatchDidFinishLoading):
+ (WebCore::ResourceLoadNotifier::sendRemainingDelegateMessages):
+ * loader/ResourceLoadNotifier.h:
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didFinishLoading):
+ Pass ResourceLoader through to Web Inspector in didFinishLoading.
+
+ * platform/network/cocoa/NetworkLoadMetrics.mm:
+ (WebCore::copyTimingData):
+ The differences from the reference start are in Seconds, not milliseconds.
+
</ins><span class="cx"> 2017-03-14 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Data interaction tests occasionally hit assertions in debug builds
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -599,13 +599,13 @@
</span><span class="cx"> networkAgent->didReceiveData(identifier, data, dataLength, encodedDataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorInstrumentation::didFinishLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, DocumentLoader* loader, const NetworkLoadMetrics& networkLoadMetrics)
</del><ins>+void InspectorInstrumentation::didFinishLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, DocumentLoader* loader, const NetworkLoadMetrics& networkLoadMetrics, ResourceLoader* resourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (!loader)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (InspectorNetworkAgent* networkAgent = instrumentingAgents.inspectorNetworkAgent())
</span><del>- networkAgent->didFinishLoading(identifier, *loader, networkLoadMetrics);
</del><ins>+ networkAgent->didFinishLoading(identifier, *loader, networkLoadMetrics, resourceLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorInstrumentation::didFailLoadingImpl(InstrumentingAgents& instrumentingAgents, unsigned long identifier, DocumentLoader* loader, const ResourceError& error)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> static void didReceiveResourceResponse(Frame&, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*);
</span><span class="cx"> static void didReceiveThreadableLoaderResponse(DocumentThreadableLoader&, unsigned long identifier);
</span><span class="cx"> static void didReceiveData(Frame*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
</span><del>- static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&);
</del><ins>+ static void didFinishLoading(Frame*, DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&, ResourceLoader*);
</ins><span class="cx"> static void didFailLoading(Frame*, DocumentLoader*, unsigned long identifier, const ResourceError&);
</span><span class="cx"> static void continueAfterXFrameOptionsDenied(Frame&, unsigned long identifier, DocumentLoader&, const ResourceResponse&);
</span><span class="cx"> static void continueWithPolicyDownload(Frame&, unsigned long identifier, DocumentLoader&, const ResourceResponse&);
</span><span class="lines">@@ -327,7 +327,7 @@
</span><span class="cx"> static void didReceiveResourceResponseImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceResponse&, ResourceLoader*);
</span><span class="cx"> static void didReceiveThreadableLoaderResponseImpl(InstrumentingAgents&, DocumentThreadableLoader&, unsigned long identifier);
</span><span class="cx"> static void didReceiveDataImpl(InstrumentingAgents&, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
</span><del>- static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const NetworkLoadMetrics&);
</del><ins>+ static void didFinishLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const NetworkLoadMetrics&, ResourceLoader*);
</ins><span class="cx"> static void didFailLoadingImpl(InstrumentingAgents&, unsigned long identifier, DocumentLoader*, const ResourceError&);
</span><span class="cx"> static void didFinishXHRLoadingImpl(InstrumentingAgents&, unsigned long identifier, std::optional<String> decodedText, const String& url, const String& sendURL, unsigned sendLineNumber, unsigned sendColumnNumber);
</span><span class="cx"> static void willLoadXHRSynchronouslyImpl(InstrumentingAgents&);
</span><span class="lines">@@ -858,10 +858,10 @@
</span><span class="cx"> didReceiveDataImpl(*instrumentingAgents, identifier, data, dataLength, encodedDataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::didFinishLoading(Frame* frame, DocumentLoader* loader, unsigned long identifier, const NetworkLoadMetrics& networkLoadMetrics)
</del><ins>+inline void InspectorInstrumentation::didFinishLoading(Frame* frame, DocumentLoader* loader, unsigned long identifier, const NetworkLoadMetrics& networkLoadMetrics, ResourceLoader* resourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</span><del>- didFinishLoadingImpl(*instrumentingAgents, identifier, loader, networkLoadMetrics);
</del><ins>+ didFinishLoadingImpl(*instrumentingAgents, identifier, loader, networkLoadMetrics, resourceLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void InspectorInstrumentation::didFailLoading(Frame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceError& error)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -419,13 +419,18 @@
</span><span class="cx"> m_frontendDispatcher->dataReceived(requestId, timestamp(), dataLength, encodedDataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InspectorNetworkAgent::didFinishLoading(unsigned long identifier, DocumentLoader& loader, const NetworkLoadMetrics& networkLoadMetrics)
</del><ins>+void InspectorNetworkAgent::didFinishLoading(unsigned long identifier, DocumentLoader& loader, const NetworkLoadMetrics& networkLoadMetrics, ResourceLoader* resourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> if (m_hiddenRequestIdentifiers.remove(identifier))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: We should use the NetworkLoadMetrics's responseEnd to match ResourceTiming.
- double elapsedFinishTime = timestamp();
</del><ins>+ double elapsedFinishTime;
+ if (resourceLoader && networkLoadMetrics.isComplete()) {
+ MonotonicTime startTime = resourceLoader->loadTiming().startTime();
+ double startTimeInInspector = m_environment.executionStopwatch()->elapsedTimeSince(startTime);
+ elapsedFinishTime = startTimeInInspector + networkLoadMetrics.responseEnd.seconds();
+ } else
+ elapsedFinishTime = timestamp();
</ins><span class="cx">
</span><span class="cx"> String requestId = IdentifiersFactory::requestId(identifier);
</span><span class="cx"> if (m_resourcesData->resourceType(requestId) == InspectorPageAgent::DocumentResource)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.h (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.h 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.h 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void willSendRequest(unsigned long identifier, DocumentLoader&, ResourceRequest&, const ResourceResponse& redirectResponse);
</span><span class="cx"> void didReceiveResponse(unsigned long identifier, DocumentLoader&, const ResourceResponse&, ResourceLoader*);
</span><span class="cx"> void didReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
</span><del>- void didFinishLoading(unsigned long identifier, DocumentLoader&, const NetworkLoadMetrics&);
</del><ins>+ void didFinishLoading(unsigned long identifier, DocumentLoader&, const NetworkLoadMetrics&, ResourceLoader*);
</ins><span class="cx"> void didFailLoading(unsigned long identifier, DocumentLoader&, const ResourceError&);
</span><span class="cx"> void didLoadResourceFromMemoryCache(DocumentLoader&, CachedResource&);
</span><span class="cx"> void didReceiveThreadableLoaderResponse(unsigned long identifier, DocumentThreadableLoader&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> // for preflight failures and distinguish them better from non-preflight requests.
</span><span class="cx"> NetworkLoadMetrics emptyMetrics;
</span><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(*frame, identifier, frame->loader().documentLoader(), response, nullptr);
</span><del>- InspectorInstrumentation::didFinishLoading(frame, frame->loader().documentLoader(), identifier, emptyMetrics);
</del><ins>+ InspectorInstrumentation::didFinishLoading(frame, frame->loader().documentLoader(), identifier, emptyMetrics, nullptr);
</ins><span class="cx">
</span><span class="cx"> CrossOriginPreflightResultCache::singleton().appendEntry(loader.securityOrigin().toString(), request.url(), WTFMove(result));
</span><span class="cx"> loader.preflightSuccess(WTFMove(request));
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> NetworkLoadMetrics emptyMetrics;
</span><span class="cx"> unsigned long identifier = m_identifierForLoadWithoutResourceLoader;
</span><span class="cx"> m_identifierForLoadWithoutResourceLoader = 0;
</span><del>- frameLoader()->notifier().dispatchDidFinishLoading(this, identifier, emptyMetrics);
</del><ins>+ frameLoader()->notifier().dispatchDidFinishLoading(this, identifier, emptyMetrics, nullptr);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> maybeFinishLoadingMultipartContent();
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadNotifiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> if (Page* page = m_frame.page())
</span><span class="cx"> page->progress().completeProgress(loader->identifier());
</span><span class="cx">
</span><del>- dispatchDidFinishLoading(loader->documentLoader(), loader->identifier(), networkLoadMetrics);
</del><ins>+ dispatchDidFinishLoading(loader->documentLoader(), loader->identifier(), networkLoadMetrics, loader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoadNotifier::didFailToLoad(ResourceLoader* loader, const ResourceError& error)
</span><span class="lines">@@ -153,13 +153,13 @@
</span><span class="cx"> InspectorInstrumentation::didReceiveData(&m_frame, identifier, data, dataLength, encodedDataLength);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceLoadNotifier::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier, const NetworkLoadMetrics& networkLoadMetrics)
</del><ins>+void ResourceLoadNotifier::dispatchDidFinishLoading(DocumentLoader* loader, unsigned long identifier, const NetworkLoadMetrics& networkLoadMetrics, ResourceLoader* resourceLoader)
</ins><span class="cx"> {
</span><span class="cx"> // Notifying the FrameLoaderClient may cause the frame to be destroyed.
</span><span class="cx"> Ref<Frame> protect(m_frame);
</span><span class="cx"> m_frame.loader().client().dispatchDidFinishLoading(loader, identifier);
</span><span class="cx">
</span><del>- InspectorInstrumentation::didFinishLoading(&m_frame, loader, identifier, networkLoadMetrics);
</del><ins>+ InspectorInstrumentation::didFinishLoading(&m_frame, loader, identifier, networkLoadMetrics, resourceLoader);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoadNotifier::dispatchDidFailLoading(DocumentLoader* loader, unsigned long identifier, const ResourceError& error)
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx">
</span><span class="cx"> if (error.isNull()) {
</span><span class="cx"> NetworkLoadMetrics emptyMetrics;
</span><del>- dispatchDidFinishLoading(loader, identifier, emptyMetrics);
</del><ins>+ dispatchDidFinishLoading(loader, identifier, emptyMetrics, nullptr);
</ins><span class="cx"> } else
</span><span class="cx"> dispatchDidFailLoading(loader, identifier, error);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadNotifierh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.h (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoadNotifier.h 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.h 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse);
</span><span class="cx"> void dispatchDidReceiveResponse(DocumentLoader*, unsigned long identifier, const ResourceResponse&, ResourceLoader* = nullptr);
</span><span class="cx"> void dispatchDidReceiveData(DocumentLoader*, unsigned long identifier, const char* data, int dataLength, int encodedDataLength);
</span><del>- void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&);
</del><ins>+ void dispatchDidFinishLoading(DocumentLoader*, unsigned long identifier, const NetworkLoadMetrics&, ResourceLoader*);
</ins><span class="cx"> void dispatchDidFailLoading(DocumentLoader*, unsigned long identifier, const ResourceError&);
</span><span class="cx">
</span><span class="cx"> void sendRemainingDelegateMessages(DocumentLoader*, unsigned long identifier, const ResourceRequest&, const ResourceResponse&, const char* data, int dataLength, int encodedDataLength, const ResourceError&);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: We should have NetworkLoadMetrics for ApplicationCache loads.
</span><span class="cx"> NetworkLoadMetrics emptyMetrics;
</span><del>- InspectorInstrumentation::didFinishLoading(m_frame, m_frame->loader().documentLoader(), m_currentResourceIdentifier, emptyMetrics);
</del><ins>+ InspectorInstrumentation::didFinishLoading(m_frame, m_frame->loader().documentLoader(), m_currentResourceIdentifier, emptyMetrics, nullptr);
</ins><span class="cx">
</span><span class="cx"> if (handle == m_manifestHandle) {
</span><span class="cx"> didFinishLoadingManifest();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaNetworkLoadMetricsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebCore/platform/network/cocoa/NetworkLoadMetrics.mm 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> {
</span><span class="cx"> if (!timingData)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // This is not the navigationStart time in monotonic time, but the other times are relative to this time
</span><span class="cx"> // and only the differences between times are stored.
</span><span class="cx"> double referenceStart = timingValue(timingData, @"_kCFNTimingDataFetchStart");
</span><del>-
</del><ins>+
</ins><span class="cx"> double domainLookupStart = timingValue(timingData, @"_kCFNTimingDataDomainLookupStart");
</span><span class="cx"> double domainLookupEnd = timingValue(timingData, @"_kCFNTimingDataDomainLookupEnd");
</span><span class="cx"> double connectStart = timingValue(timingData, @"_kCFNTimingDataConnectStart");
</span><span class="lines">@@ -53,15 +53,15 @@
</span><span class="cx"> double connectEnd = timingValue(timingData, @"_kCFNTimingDataConnectEnd");
</span><span class="cx"> double requestStart = timingValue(timingData, @"_kCFNTimingDataRequestStart");
</span><span class="cx"> double responseStart = timingValue(timingData, @"_kCFNTimingDataResponseStart");
</span><del>-
- timing.domainLookupStart = Seconds(domainLookupStart <= 0 ? Seconds(-1) : Seconds::fromMilliseconds(domainLookupStart - referenceStart));
- timing.domainLookupEnd = Seconds(domainLookupEnd <= 0 ? Seconds(-1) : Seconds::fromMilliseconds(domainLookupEnd - referenceStart));
- timing.connectStart = Seconds(connectStart <= 0 ? Seconds(-1) : Seconds::fromMilliseconds(connectStart - referenceStart));
- timing.secureConnectionStart = Seconds(secureConnectionStart <= 0 ? Seconds(-1) : Seconds::fromMilliseconds(secureConnectionStart - referenceStart));
- timing.connectEnd = Seconds(connectEnd <= 0 ? Seconds(-1) : Seconds::fromMilliseconds(connectEnd - referenceStart));
- timing.requestStart = Seconds(requestStart <= 0 ? Seconds(0) : Seconds::fromMilliseconds(requestStart - referenceStart));
- timing.responseStart = Seconds(responseStart <= 0 ? Seconds(0) : Seconds::fromMilliseconds(responseStart - referenceStart));
</del><span class="cx">
</span><ins>+ timing.domainLookupStart = Seconds(domainLookupStart <= 0 ? -1 : domainLookupStart - referenceStart);
+ timing.domainLookupEnd = Seconds(domainLookupEnd <= 0 ? -1 : domainLookupEnd - referenceStart);
+ timing.connectStart = Seconds(connectStart <= 0 ? -1 : connectStart - referenceStart);
+ timing.secureConnectionStart = Seconds(secureConnectionStart <= 0 ? -1 : secureConnectionStart - referenceStart);
+ timing.connectEnd = Seconds(connectEnd <= 0 ? -1 : connectEnd - referenceStart);
+ timing.requestStart = Seconds(requestStart <= 0 ? 0 : requestStart - referenceStart);
+ timing.responseStart = Seconds(responseStart <= 0 ? 0 : responseStart - referenceStart);
+
</ins><span class="cx"> // NOTE: responseEnd is not populated in this code path.
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebInspectorUI/ChangeLog 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-14 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: More accurate Resource Timing data in Web Inspector
+ https://bugs.webkit.org/show_bug.cgi?id=169577
+
+ Reviewed by Youenn Fablet.
+
+ * UserInterface/Models/ResourceTimingData.js:
+ (WebInspector.ResourceTimingData.prototype.get requestStart):
+ (WebInspector.ResourceTimingData.prototype.get responseStart):
+ Fallback to the startTime if available instead of using the
+ inaccurate WebContentProcess gathered timestamps.
+
+ (WebInspector.ResourceTimingData.prototype.markResponseEndTime):
+ Verify responseEnd compared to other times we may have.
+
</ins><span class="cx"> 2017-03-14 Devin Rousso <webkit@devinrousso.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove unnecessary assert for Number.percentageString
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceModelsResourceTimingDatajs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimingData.js (213916 => 213917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimingData.js 2017-03-14 17:58:09 UTC (rev 213916)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/ResourceTimingData.js 2017-03-14 18:19:47 UTC (rev 213917)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> payload = {};
</span><span class="cx">
</span><span class="cx"> function offsetToTimestamp(offset) {
</span><del>- return offset > 0 ? payload.startTime + offset / 1000 : NaN;
</del><ins>+ return offset > 0 ? payload.startTime + (offset / 1000) : NaN;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> let data = {
</span><span class="lines">@@ -95,13 +95,15 @@
</span><span class="cx"> get connectStart() { return this._connectStart; }
</span><span class="cx"> get connectEnd() { return this._connectEnd; }
</span><span class="cx"> get secureConnectionStart() { return this._secureConnectionStart; }
</span><del>- get requestStart() { return this._requestStart || this._resource.requestSentTimestamp; }
- get responseStart() { return this._responseStart || this._resource.responseReceivedTimestamp; }
</del><ins>+ get requestStart() { return this._requestStart || this._startTime || this._resource.requestSentTimestamp; }
+ get responseStart() { return this._responseStart || this._startTime || this._resource.responseReceivedTimestamp; }
</ins><span class="cx"> get responseEnd() { return this._responseEnd || this._resource.finishedOrFailedTimestamp; }
</span><span class="cx">
</span><span class="cx"> markResponseEndTime(responseEnd)
</span><span class="cx"> {
</span><span class="cx"> console.assert(typeof responseEnd === "number");
</span><ins>+ console.assert(isNaN(responseEnd) || responseEnd >= this.startTime, "responseEnd time should be greater than the start time", this.startTime, responseEnd);
+ console.assert(isNaN(responseEnd) || responseEnd >= this.requestStart, "responseEnd time should be greater than the request time", this.requestStart, responseEnd);
</ins><span class="cx"> this._responseEnd = responseEnd;
</span><span class="cx"> }
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>