| Index: third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| index 728ae120fdee10ce3ec349fe128a1a440f96ee29..56a3ba00a9d68d1e29a200b57101929913d121a5 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| @@ -38,6 +38,7 @@
|
| #include "core/workers/WorkerThread.h"
|
| #include "platform/network/ContentSecurityPolicyParsers.h"
|
| #include "platform/weborigin/KURL.h"
|
| +#include "public/platform/WebURLRequest.h"
|
| #include "wtf/Forward.h"
|
| #include "wtf/Noncopyable.h"
|
|
|
| @@ -49,9 +50,9 @@ class CORE_EXPORT WorkerThreadStartupData final {
|
| WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData);
|
| USING_FAST_MALLOC(WorkerThreadStartupData);
|
| public:
|
| - static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
|
| + static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients, WebURLRequest::AddressSpace addressSpace, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
|
| {
|
| - return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicyHeaders, starterOrigin, workerClients, v8CacheOptions));
|
| + return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicyHeaders, starterOrigin, workerClients, addressSpace, v8CacheOptions));
|
| }
|
|
|
| ~WorkerThreadStartupData();
|
| @@ -63,6 +64,7 @@ public:
|
| WorkerThreadStartMode m_startMode;
|
| OwnPtr<Vector<CSPHeaderAndType>> m_contentSecurityPolicyHeaders;
|
|
|
| +
|
| // The SecurityOrigin of the Document creating a Worker may have
|
| // been configured with extra policy privileges when it was created
|
| // (e.g., enforce path-based file:// origins.)
|
| @@ -84,10 +86,12 @@ public:
|
| // supplies no extra 'clients', m_workerClients can be left as empty/null.
|
| OwnPtrWillBeCrossThreadPersistent<WorkerClients> m_workerClients;
|
|
|
| + WebURLRequest::AddressSpace m_addressSpace;
|
| +
|
| V8CacheOptions m_v8CacheOptions;
|
|
|
| private:
|
| - WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, V8CacheOptions);
|
| + WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>, WebURLRequest::AddressSpace, V8CacheOptions);
|
| };
|
|
|
| } // namespace blink
|
|
|