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

Unified Diff: Source/core/timing/Performance.cpp

Issue 333423004: moved to https://codereview.chromium.org/399543002/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: cleanup test Created 6 years, 5 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/loader/DocumentThreadableLoader.cpp ('k') | Source/modules/serviceworkers/FetchHeaderList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/timing/Performance.cpp
diff --git a/Source/core/timing/Performance.cpp b/Source/core/timing/Performance.cpp
index 6029829a1130437d17209a9b95938227867f6139..4778252340e2da7f69b7f151b5a33d07cc823bde 100644
--- a/Source/core/timing/Performance.cpp
+++ b/Source/core/timing/Performance.cpp
@@ -214,9 +214,11 @@ void Performance::addResourceTiming(const ResourceTimingInfo& info, Document* in
const Vector<ResourceResponse>& redirectChain = info.redirectChain();
bool allowRedirectDetails = allowsTimingRedirect(redirectChain, finalResponse, initiatorDocument);
- if (!allowRedirectDetails) {
+ // ServiceWorker doesn't support TimingInfo.
+ // FIXME: Implement ServiceWorkerURLRequestJob::GetLoadTimingInfo().
+ if (!allowRedirectDetails && !finalResponse.wasFetchedViaServiceWorker()) {
ResourceLoadTiming* finalTiming = finalResponse.resourceLoadTiming();
- ASSERT(finalTiming);
+ ASSERT(finalTiming || finalResponse.wasFetchedViaServiceWorker());
if (finalTiming)
startTime = finalTiming->requestTime;
}
« no previous file with comments | « Source/core/loader/DocumentThreadableLoader.cpp ('k') | Source/modules/serviceworkers/FetchHeaderList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698