third_party/WebKit/Source/core/dom/ScriptLoader.cpp - Issue 1389383003: WIP: Introduce CompressibleString

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/dom/ScriptLoader.cpp

Issue 1389383003: WIP: Introduce CompressibleString Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase onto crrev.com/1564773002 Created 4 years, 11 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 | « third_party/WebKit/Source/bindings/core/v8/WorkerOrWorkletScriptController.cpp ('k') | third_party/WebKit/Source/core/fetch/ScriptResource.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/ScriptLoader.cpp

diff --git a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

index e656de67ada8e2be16cbce860cb73955745b1ffc..7aeec8473c0b10f1d564b7004cd55674c30a3ff6 100644

--- a/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

+++ b/third_party/WebKit/Source/core/dom/ScriptLoader.cpp

@@ -361,9 +361,9 @@ bool ScriptLoader::executeScript(const ScriptSourceCode& sourceCode, double* com

const ContentSecurityPolicy* csp = elementDocument->contentSecurityPolicy();

bool shouldBypassMainWorldCSP = (frame && frame->script().shouldBypassMainWorldCSP())

|| csp->allowScriptWithNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr))

- || csp->allowScriptWithHash(sourceCode.source());

+ || csp->allowScriptWithHash(sourceCode.source().toString());

- if (!m_isExternalScript && (!shouldBypassMainWorldCSP && !csp->allowInlineScript(elementDocument->url(), m_startLineNumber, sourceCode.source()))) {

+ if (!m_isExternalScript && (!shouldBypassMainWorldCSP && !csp->allowInlineScript(elementDocument->url(), m_startLineNumber, sourceCode.source().toString()))) {

return false;

}