content/renderer/render_frame_impl.cc - Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context"

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/render_frame_impl.cc

Issue 2142523004: M52: Merge "Reland: service worker: Don't control a subframe of an insecure context" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743

Patch Set: fix compile errors Created 4 years, 5 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 | « content/public/browser/content_browser_client.h ('k') | content/renderer/service_worker/service_worker_context_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_frame_impl.cc

diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc

index 8bd405abff36aa4db7edc4f142a052f910484ba6..8d049b23fc036b75830267dac763d4802ecafd57 100644

--- a/content/renderer/render_frame_impl.cc

+++ b/content/renderer/render_frame_impl.cc

@@ -3073,8 +3073,8 @@ void RenderFrameImpl::didCreateDataSource(blink::WebLocalFrame* frame,

ServiceWorkerNetworkProvider::AttachToDocumentState(

DocumentState::FromDataSource(datasource),

ServiceWorkerNetworkProvider::CreateForNavigation(

- routing_id_, navigation_state->request_params(),

- frame->effectiveSandboxFlags(), content_initiated));

+ routing_id_, navigation_state->request_params(), frame,

+ content_initiated));

}

void RenderFrameImpl::didStartProvisionalLoad(blink::WebLocalFrame* frame,