third_party/WebKit/Source/core/dom/ScriptLoader.cpp - Issue 1569623002: Fix-up some code relating to SRI double-requesting scripts

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 1569623002: Fix-up some code relating to SRI double-requesting scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: More fixes 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/LayoutTests/http/tests/inspector/network/subresource-integrity-number-of-requests-for-stylesheet-expected.txt ('k') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp » ('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 2ce504a73a69d26b71398ece3b0b0f1977464d87..e656de67ada8e2be16cbce860cb73955745b1ffc 100644

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

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

@@ -301,8 +301,8 @@ bool ScriptLoader::fetchScript(const String& sourceUrl, FetchRequest::DeferOptio

request.setDefer(defer);

String integrityAttr = m_element->fastGetAttribute(HTMLNames::integrityAttr);

- IntegrityMetadataSet metadataSet;

if (!integrityAttr.isEmpty()) {

+ IntegrityMetadataSet metadataSet;

SubresourceIntegrity::parseIntegrityAttribute(integrityAttr, metadataSet, elementDocument.get());

request.setIntegrityMetadata(metadataSet);

}