| 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 498704116e514b1e2cec85d3cac66397b67eeb0b..c35d5cd3233e6485dd3202bcaf1ecc43683b5850 100644
|
| --- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| +++ b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h
|
| @@ -35,6 +35,7 @@
|
| #include "core/CoreExport.h"
|
| #include "core/frame/csp/ContentSecurityPolicy.h"
|
| #include "core/workers/WorkerClients.h"
|
| +#include "core/workers/WorkerSettings.h"
|
| #include "core/workers/WorkerThread.h"
|
| #include "platform/network/ContentSecurityPolicyParsers.h"
|
| #include "platform/weborigin/KURL.h"
|
| @@ -52,9 +53,9 @@ class CORE_EXPORT WorkerThreadStartupData final {
|
| WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData);
|
| USING_FAST_MALLOC(WorkerThreadStartupData);
|
| public:
|
| - static std::unique_ptr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, std::unique_ptr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const String& referrerPolicy, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, const Vector<String>* originTrialTokens, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
|
| + static std::unique_ptr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, std::unique_ptr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const String& referrerPolicy, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, const Vector<String>* originTrialTokens, std::unique_ptr<WorkerSettings> workerSettings, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault)
|
| {
|
| - return wrapUnique(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, std::move(cachedMetaData), startMode, contentSecurityPolicyHeaders, referrerPolicy, starterOrigin, workerClients, addressSpace, originTrialTokens, v8CacheOptions));
|
| + return wrapUnique(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, std::move(cachedMetaData), startMode, contentSecurityPolicyHeaders, referrerPolicy, starterOrigin, workerClients, addressSpace, originTrialTokens, std::move(workerSettings), v8CacheOptions));
|
| }
|
|
|
| ~WorkerThreadStartupData();
|
| @@ -92,10 +93,12 @@ public:
|
|
|
| WebAddressSpace m_addressSpace;
|
|
|
| + std::unique_ptr<WorkerSettings> m_workerSettings;
|
| +
|
| V8CacheOptions m_v8CacheOptions;
|
|
|
| private:
|
| - WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, std::unique_ptr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const String& referrerPolicy, const SecurityOrigin*, WorkerClients*, WebAddressSpace, const Vector<String>* originTrialTokens, V8CacheOptions);
|
| + WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, std::unique_ptr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const String& referrerPolicy, const SecurityOrigin*, WorkerClients*, WebAddressSpace, const Vector<String>* originTrialTokens, std::unique_ptr<WorkerSettings>, V8CacheOptions);
|
| };
|
|
|
| } // namespace blink
|
|
|