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

Unified Diff: Source/web/ServiceWorkerGlobalScopeClientImpl.cpp

Issue 580993002: Revert of [ServivceWorker] Treat rejecting respondWith as a Network Error (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 3 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/web/ServiceWorkerGlobalScopeClientImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ServiceWorkerGlobalScopeClientImpl.cpp
diff --git a/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp b/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp
index ab88fe3e175ff4e6484243afe5449a5985baf42a..a08df446ac810f6955a6b7667f8912a069e18d89 100644
--- a/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp
+++ b/Source/web/ServiceWorkerGlobalScopeClientImpl.cpp
@@ -74,13 +74,20 @@
m_client.didHandleInstallEvent(installEventID, result);
}
-void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID)
+void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID, Response* response)
{
- m_client.didHandleFetchEvent(fetchEventID);
-}
+ if (!response) {
+ m_client.didHandleFetchEvent(fetchEventID);
+ return;
+ }
-void ServiceWorkerGlobalScopeClientImpl::didHandleFetchEvent(int fetchEventID, const WebServiceWorkerResponse& webResponse)
-{
+ WebServiceWorkerResponse webResponse;
+ response->populateWebServiceWorkerResponse(webResponse);
+ if (webResponse.status() == 0) {
+ // The status code is 0 means a network error.
+ m_client.didHandleFetchEvent(fetchEventID);
+ return;
+ }
m_client.didHandleFetchEvent(fetchEventID, webResponse);
}
« no previous file with comments | « Source/web/ServiceWorkerGlobalScopeClientImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698