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

Unified Diff: content/child/web_url_loader_impl.cc

Issue 588153002: [ServiceWorker] Plumbing the request mode from the renderer to the ServiceWorker. [2/2 chromium] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 4d45371f453281d60ffd0b3165909c1f5175c9a6..897013eb349f863fb1962c618ece2cc91ab90b25 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -22,6 +22,7 @@
#include "content/child/web_url_request_util.h"
#include "content/child/weburlresponse_extradata_impl.h"
#include "content/common/resource_request_body.h"
+#include "content/common/service_worker/service_worker_types.h"
#include "content/public/child/request_peer.h"
#include "net/base/data_url.h"
#include "net/base/filename_util.h"
@@ -199,6 +200,21 @@ int GetInfoFromDataURL(const GURL& url,
return net::OK;
}
+FetchRequestMode GetFetchRequestMode(const WebURLRequest& request) {
+ switch (request.fetchRequestMode()) {
+ case WebURLRequest::FetchRequestModeSameOrigin:
+ return FETCH_REQUEST_MODE_SAME_ORIGIN;
+ case WebURLRequest::FetchRequestModeNoCORS:
+ return FETCH_REQUEST_MODE_NO_CORS;
+ case WebURLRequest::FetchRequestModeCORS:
+ return FETCH_REQUEST_MODE_CORS;
+ case WebURLRequest::FetchRequestModeCORSWithForcedPreflight:
+ return FETCH_REQUEST_MODE_CORS_WITH_FORCED_PREFLIGHT;
+ }
+ NOTREACHED();
+ return FETCH_REQUEST_MODE_NO_CORS;
+}
+
} // namespace
// WebURLLoaderImpl::Context --------------------------------------------------
@@ -397,6 +413,7 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
request_info.download_to_file = request.downloadToFile();
request_info.has_user_gesture = request.hasUserGesture();
request_info.skip_service_worker = request.skipServiceWorker();
+ request_info.fetch_request_mode = GetFetchRequestMode(request);
request_info.extra_data = request.extraData();
referrer_policy_ = request.referrerPolicy();
request_info.referrer_policy = request.referrerPolicy();

Powered by Google App Engine
This is Rietveld 408576698