Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(398)

Unified Diff: Source/core/inspector/InspectorResourceAgent.cpp

Issue 15863002: Fix ResourceLoadTiming Resolution Issue 3rd step - remove old fields (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/page/PerformanceResourceTiming.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/inspector/InspectorResourceAgent.cpp
diff --git a/Source/core/inspector/InspectorResourceAgent.cpp b/Source/core/inspector/InspectorResourceAgent.cpp
index c901ad82c015fdf43c9ab39be9af92704559154b..d8a349596bc28bd47877e7811a0816220400f57f 100644
--- a/Source/core/inspector/InspectorResourceAgent.cpp
+++ b/Source/core/inspector/InspectorResourceAgent.cpp
@@ -108,10 +108,8 @@ static PassRefPtr<InspectorObject> buildObjectForHeaders(const HTTPHeaderMap& he
static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(const ResourceLoadTiming& timing, DocumentLoader* loader)
{
-#ifdef ENABLE_DOUBLE_RESOURCE_LOAD_TIMING
- double requestTime = timing.requestTime;
return TypeBuilder::Network::ResourceTiming::create()
- .setRequestTime(loader->timing()->monotonicTimeToPseudoWallTime(requestTime))
+ .setRequestTime(loader->timing()->monotonicTimeToPseudoWallTime(timing.requestTime))
.setProxyStart(timing.calculateMillisecondDelta(timing.proxyStart))
.setProxyEnd(timing.calculateMillisecondDelta(timing.proxyEnd))
.setDnsStart(timing.calculateMillisecondDelta(timing.dnsStart))
@@ -124,22 +122,6 @@ static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(con
.setSendEnd(timing.calculateMillisecondDelta(timing.sendEnd))
.setReceiveHeadersEnd(timing.calculateMillisecondDelta(timing.receiveHeadersEnd))
.release();
-#else
- return TypeBuilder::Network::ResourceTiming::create()
- .setRequestTime(loader->timing()->monotonicTimeToPseudoWallTime(timing.convertResourceLoadTimeToMonotonicTime(0)))
- .setProxyStart(timing.proxyStart)
- .setProxyEnd(timing.proxyEnd)
- .setDnsStart(timing.dnsStart)
- .setDnsEnd(timing.dnsEnd)
- .setConnectStart(timing.connectStart)
- .setConnectEnd(timing.connectEnd)
- .setSslStart(timing.sslStart)
- .setSslEnd(timing.sslEnd)
- .setSendStart(timing.sendStart)
- .setSendEnd(timing.sendEnd)
- .setReceiveHeadersEnd(timing.receiveHeadersEnd)
- .release();
-#endif
}
static PassRefPtr<TypeBuilder::Network::Request> buildObjectForResourceRequest(const ResourceRequest& request)
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/page/PerformanceResourceTiming.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698