Source/core/dom/ScriptLoader.cpp - Issue 1126343003: Ignore unknown options to subresource integrity

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

Issue 1126343003: Ignore unknown options to subresource integrity (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Removed option parsing + nits from mkwst Created 5 years, 7 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 | « LayoutTests/http/tests/security/subresourceIntegrity/subresource-integrity-style-blocked-expected.txt ('k') | Source/core/frame/SubresourceIntegrity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/dom/ScriptLoader.cpp

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

index cd982a64aa58959bd88dd7d1267761e554a61992..59c83ba3466fa06614c21ae3f217d6d89b9352c6 100644

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

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

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

if (m_isExternalScript) {

const KURL resourceUrl = sourceCode.resource()->resourceRequest().url();

- if (!SubresourceIntegrity::CheckSubresourceIntegrity(*m_element, sourceCode.source(), sourceCode.resource()->url(), sourceCode.resource()->mimeType(), *sourceCode.resource())) {

+ if (!SubresourceIntegrity::CheckSubresourceIntegrity(*m_element, sourceCode.source(), sourceCode.resource()->url(), *sourceCode.resource())) {

return false;

}