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

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

Issue 1775933002: CORS-RFC1918: Pipe creator address space through SharedWorker creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typo Created 4 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: third_party/WebKit/Source/core/workers/WorkerScriptLoader.h
diff --git a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.h b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.h
index 67c44a3b2a3cb4382ec0424df85327f3fd38be8e..cd2283a7d68a1a99e71a5e6fc29a8248900d6629 100644
--- a/third_party/WebKit/Source/core/workers/WorkerScriptLoader.h
+++ b/third_party/WebKit/Source/core/workers/WorkerScriptLoader.h
@@ -33,6 +33,7 @@
#include "core/loader/ThreadableLoaderClient.h"
#include "platform/network/ResourceRequest.h"
#include "platform/weborigin/KURL.h"
+#include "public/platform/WebAddressSpace.h"
#include "public/platform/WebURLRequest.h"
#include "wtf/Allocator.h"
#include "wtf/Functional.h"
@@ -56,12 +57,12 @@ public:
return adoptRef(new WorkerScriptLoader());
}
- void loadSynchronously(ExecutionContext&, const KURL&, CrossOriginRequestPolicy);
+ void loadSynchronously(ExecutionContext&, const KURL&, CrossOriginRequestPolicy, WebAddressSpace);
// TODO: |finishedCallback| is not currently guaranteed to be invoked if
// used from worker context and the worker shuts down in the middle of an
// operation. This will cause leaks when we support nested workers.
// Note that callbacks could be invoked before loadAsynchronously() returns.
- void loadAsynchronously(ExecutionContext&, const KURL&, CrossOriginRequestPolicy, PassOwnPtr<SameThreadClosure> responseCallback, PassOwnPtr<SameThreadClosure> finishedCallback);
+ void loadAsynchronously(ExecutionContext&, const KURL&, CrossOriginRequestPolicy, WebAddressSpace, PassOwnPtr<SameThreadClosure> responseCallback, PassOwnPtr<SameThreadClosure> finishedCallback);
// This will immediately invoke |finishedCallback| if loadAsynchronously()
// is in progress.
@@ -80,7 +81,7 @@ public:
ContentSecurityPolicy* contentSecurityPolicy() { return m_contentSecurityPolicy.get(); }
PassRefPtrWillBeRawPtr<ContentSecurityPolicy> releaseContentSecurityPolicy() { return m_contentSecurityPolicy.release(); }
- WebURLRequest::AddressSpace responseAddressSpace() const { return m_responseAddressSpace; }
+ WebAddressSpace responseAddressSpace() const { return m_responseAddressSpace; }
// ThreadableLoaderClient
void didReceiveResponse(unsigned long /*identifier*/, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
@@ -98,7 +99,7 @@ private:
WorkerScriptLoader();
~WorkerScriptLoader() override;
- ResourceRequest createResourceRequest(ExecutionContext&);
+ ResourceRequest createResourceRequest(WebAddressSpace);
void notifyError();
void notifyFinished();
@@ -121,7 +122,7 @@ private:
OwnPtr<Vector<char>> m_cachedMetadata;
WebURLRequest::RequestContext m_requestContext;
RefPtrWillBePersistent<ContentSecurityPolicy> m_contentSecurityPolicy;
- WebURLRequest::AddressSpace m_responseAddressSpace;
+ WebAddressSpace m_responseAddressSpace;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698