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

Unified Diff: third_party/WebKit/Source/platform/loader/fetch/ResourceLoader.cpp

Issue 2714423002: Rename SkipServiceWorker to ServiceWorkerMode (Closed)
Patch Set: typos-- Created 3 years, 10 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
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;
}

Powered by Google App Engine
This is Rietveld 408576698