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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp

Issue 1749153002: CORS-RFC1918: Teach ResourceRequest about "external" requests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Jochen's feedback. Created 4 years, 10 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: third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
index d49b7e4c50feafe3791f76459ddf146324b33f77..0e01670271e2e9955087a6d885790879c6e089ac 100644
--- a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp
@@ -66,7 +66,7 @@ void WorkerScriptLoader::loadSynchronously(ExecutionContext& executionContext, c
{
m_url = url;
- ResourceRequest request(createResourceRequest());
+ ResourceRequest request(createResourceRequest(executionContext));
ASSERT_WITH_SECURITY_IMPLICATION(executionContext.isWorkerGlobalScope());
ThreadableLoaderOptions options;
@@ -87,7 +87,7 @@ void WorkerScriptLoader::loadAsynchronously(ExecutionContext& executionContext,
m_finishedCallback = finishedCallback;
m_url = url;
- ResourceRequest request(createResourceRequest());
+ ResourceRequest request(createResourceRequest(executionContext));
ThreadableLoaderOptions options;
options.crossOriginRequestPolicy = crossOriginRequestPolicy;
@@ -112,11 +112,12 @@ const KURL& WorkerScriptLoader::responseURL() const
return m_responseURL;
}
-ResourceRequest WorkerScriptLoader::createResourceRequest()
+ResourceRequest WorkerScriptLoader::createResourceRequest(ExecutionContext& executionContext)
{
ResourceRequest request(m_url);
request.setHTTPMethod(HTTPNames::GET);
request.setRequestContext(m_requestContext);
+ request.setExternalRequestStateFromRequestorAddressSpace(executionContext.securityContext().addressSpace());
return request;
}

Powered by Google App Engine
This is Rietveld 408576698