Index: third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
diff --git a/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
index 488ee424fd9a77e93b1c0cb835535e6a79240be4..6ebed25507dadfa54740f30e22823c2a2978c18e 100644 |
--- a/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
+++ b/third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp |
@@ -326,8 +326,8 @@ void ResourceLoader::didReceiveResponse( |
if (m_resource->options().corsEnabled == IsCORSEnabled && |
response.wasFallbackRequiredByServiceWorker()) { |
ResourceRequest request = m_resource->lastResourceRequest(); |
- DCHECK_EQ(request.skipServiceWorker(), |
- WebURLRequest::SkipServiceWorker::None); |
+ DCHECK_EQ(request.getServiceWorkerMode(), |
+ WebURLRequest::ServiceWorkerMode::All); |
// This code handles the case when a regular controlling service worker |
// doesn't handle a cross origin request. When this happens we still want |
// to give foreign fetch a chance to handle the request, so only skip the |
@@ -340,8 +340,7 @@ void ResourceLoader::didReceiveResponse( |
handleError(ResourceError::cancelledError(response.url())); |
return; |
} |
- request.setSkipServiceWorker( |
- WebURLRequest::SkipServiceWorker::Controlling); |
+ request.setServiceWorkerMode(WebURLRequest::ServiceWorkerMode::Foreign); |
restart(request); |
return; |
} |