Source/core/html/HTMLLinkElement.cpp - Issue 997153003: Recommit Enable SRI only for same origin and CORS content

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/html/HTMLLinkElement.cpp

Issue 997153003: Recommit Enable SRI only for same origin and CORS content (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 9 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

Index: Source/core/html/HTMLLinkElement.cpp

diff --git a/Source/core/html/HTMLLinkElement.cpp b/Source/core/html/HTMLLinkElement.cpp

index 19b1f937d0a818888a3086ea13d5021841373e48..e0783b14c1fc7d3f0e4ec27d0c77fddbf69422b5 100644

--- a/Source/core/html/HTMLLinkElement.cpp

+++ b/Source/core/html/HTMLLinkElement.cpp

@@ -509,7 +509,7 @@ void LinkStyle::setCSSStyleSheet(const String& href, const KURL& baseURL, const

return;

}

- if (!SubresourceIntegrity::CheckSubresourceIntegrity(*m_owner, cachedStyleSheet->sheetText(), KURL(KURL(), href), cachedStyleSheet->mimeType())) {

+ if (!cachedStyleSheet->errorOccurred() && !SubresourceIntegrity::CheckSubresourceIntegrity(*m_owner, cachedStyleSheet->sheetText(), KURL(baseURL, href), cachedStyleSheet->mimeType(), *cachedStyleSheet)) {

m_loading = false;

removePendingSheet();

notifyLoadedSheetAndAllCriticalSubresources(true);

« no previous file with comments | « Source/core/frame/SubresourceIntegrityTest.cpp ('k') | no next file » | no next file with comments »