third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp - Issue 2811793005: Rename LocalFrame::Script() to GetScriptController()

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: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

Issue 2811793005: Rename LocalFrame::Script() to GetScriptController() (Closed)

Patch Set: Created 3 years, 8 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:

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

index d708cfe37d73ad9a4f6b42e156dd8ac3d8a82054..c039bea918ac3f70932439bee7282a10e43f053f 100644

--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

@@ -1481,8 +1481,11 @@ bool ContentSecurityPolicy::ShouldBypassMainWorld(

const ExecutionContext* context) {

if (context && context->IsDocument()) {

const Document* document = ToDocument(context);

- if (document->GetFrame())

- return document->GetFrame()->Script().ShouldBypassMainWorldCSP();

+ if (document->GetFrame()) {

+ return document->GetFrame()

+ ->GetScriptController()

+ .ShouldBypassMainWorldCSP();

+ }

}

return false;

}