third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp - Issue 2231523002: Make ResourceFetcher return Resources with LoadError instead of nullptrs.

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/xmlhttprequest/XMLHttpRequest.cpp

Issue 2231523002: Make ResourceFetcher return Resources with LoadError instead of nullptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase, resolve comment rewrap conflicts. Created 4 years, 2 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/core/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/web/tests/WebDocumentSubresourceFilterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

diff --git a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

index b9cf5ab7b43f3fe65ffcb5186ca8893d8ebabe1c..91188b57fbf107336e00b9d22827900354745acf 100644

--- a/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

+++ b/third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

@@ -1468,7 +1468,12 @@ void XMLHttpRequest::didFail(const ResourceError& error) {

if (m_error)

return;

- if (error.isCancellation()) {

+ // Internally, access check violations are considered `cancellations`, but

+ // at least the mixed-content and CSP specs require them to be surfaced as

+ // network errors to the page. See:

+ // [1] https://www.w3.org/TR/mixed-content/#algorithms,

+ // [2] https://www.w3.org/TR/CSP3/#fetch-integration.

+ if (error.isCancellation() && !error.isAccessCheck()) {

handleDidCancel();

return;

}