content/renderer/shared_worker/embedded_shared_worker_stub.cc - Issue 2105503002: Skip foreign fetch when the skipServiceWorker flag is set on a request.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/shared_worker/embedded_shared_worker_stub.cc

Issue 2105503002: Skip foreign fetch when the skipServiceWorker flag is set on a request. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add comments explaing why skip is set to ::Controlling for fallback requests Created 4 years, 6 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

« content/common/service_worker/service_worker_types.h ('K') | « content/renderer/render_frame_impl.cc ('k') | third_party/WebKit/LayoutTests/http/tests/serviceworker/foreign-fetch-basics.html » ('j') | third_party/WebKit/Source/platform/network/ResourceRequest.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/shared_worker/embedded_shared_worker_stub.cc

diff --git a/content/renderer/shared_worker/embedded_shared_worker_stub.cc b/content/renderer/shared_worker/embedded_shared_worker_stub.cc

index 4b7509754fc387908a83a7916bdfab0e13557248..c6ad799c0b363c6bd68b88074a33a28cd1e7c0c0 100644

--- a/content/renderer/shared_worker/embedded_shared_worker_stub.cc

+++ b/content/renderer/shared_worker/embedded_shared_worker_stub.cc

@@ -91,8 +91,11 @@ class WebServiceWorkerNetworkProviderImpl

// renderer process hasn't received SetControllerServiceWorker message.

if (request.getRequestContext() !=

blink::WebURLRequest::RequestContextSharedWorker &&

- !provider->IsControlledByServiceWorker()) {

- request.setSkipServiceWorker(true);

+ !provider->IsControlledByServiceWorker() &&

+ request.skipServiceWorker() !=

+ blink::WebURLRequest::SkipServiceWorker::All) {

+ request.setSkipServiceWorker(

+ blink::WebURLRequest::SkipServiceWorker::Controlling);

}