Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1141)

Unified Diff: Source/core/loader/DocumentThreadableLoader.cpp

Issue 344883006: Give the RequestFetcher access to cross-origin URLs when allowed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 5 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 | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/loader/DocumentThreadableLoader.cpp
diff --git a/Source/core/loader/DocumentThreadableLoader.cpp b/Source/core/loader/DocumentThreadableLoader.cpp
index bcb00b9b67766a00380e91cad3274af94fc719e0..a7c82ef910716aed701c02dd3f609ad45492ca9c 100644
--- a/Source/core/loader/DocumentThreadableLoader.cpp
+++ b/Source/core/loader/DocumentThreadableLoader.cpp
@@ -426,6 +426,8 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, Resou
m_timeoutTimer.startOneShot(m_options.timeoutMilliseconds / 1000.0, FROM_HERE);
FetchRequest newRequest(request, m_options.initiator, resourceLoaderOptions);
+ if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests)
+ newRequest.setOriginRestriction(FetchRequest::NoOriginRestriction);
ASSERT(!resource());
if (request.requestContext() == blink::WebURLRequest::RequestContextVideo || request.requestContext() == blink::WebURLRequest::RequestContextAudio)
setResource(m_document.fetcher()->fetchMedia(newRequest));
@@ -439,6 +441,8 @@ void DocumentThreadableLoader::loadRequest(const ResourceRequest& request, Resou
}
FetchRequest fetchRequest(request, m_options.initiator, resourceLoaderOptions);
+ if (m_options.crossOriginRequestPolicy == AllowCrossOriginRequests)
+ fetchRequest.setOriginRestriction(FetchRequest::NoOriginRestriction);
ResourcePtr<Resource> resource = m_document.fetcher()->fetchSynchronously(fetchRequest);
ResourceResponse response = resource ? resource->response() : ResourceResponse();
unsigned long identifier = resource ? resource->identifier() : std::numeric_limits<unsigned long>::max();
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/web/tests/WebFrameTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698