third_party/WebKit/Source/core/fetch/ScriptResource.cpp - Issue 1561903002: Fix double resource request for script resources with integrity attr.

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/fetch/ScriptResource.cpp

Issue 1561903002: Fix double resource request for script resources with integrity attr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: 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

« third_party/WebKit/Source/core/dom/ScriptLoader.cpp ('K') | « third_party/WebKit/Source/core/dom/ScriptLoader.cpp ('k') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp » ('j') | third_party/WebKit/Source/core/html/parser/HTMLPreloadScanner.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/fetch/ScriptResource.cpp

diff --git a/third_party/WebKit/Source/core/fetch/ScriptResource.cpp b/third_party/WebKit/Source/core/fetch/ScriptResource.cpp

index c4c35e6cd206fff0a7f35402047842e24edd96d4..fb4cfdd77c09777f3676f9bfceb86903ecdf1af0 100644

--- a/third_party/WebKit/Source/core/fetch/ScriptResource.cpp

+++ b/third_party/WebKit/Source/core/fetch/ScriptResource.cpp

@@ -41,7 +41,10 @@ ResourcePtr<ScriptResource> ScriptResource::fetch(FetchRequest& request, Resourc

{

ASSERT(request.resourceRequest().frameType() == WebURLRequest::FrameTypeNone);

request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextScript);

- return toScriptResource(fetcher->requestResource(request, ScriptResourceFactory()));

+ ResourcePtr<ScriptResource> resource = toScriptResource(fetcher->requestResource(request, ScriptResourceFactory()));

+ if (resource && !request.integrityMetadata().isEmpty())

+ resource->setIntegrityMetadata(request.integrityMetadata());

+ return resource;

}

ScriptResource::ScriptResource(const ResourceRequest& resourceRequest, const String& charset)