Chromium Code Reviews| 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 cc3501f0e10035d5b890781438110281ef6bc666..6767b815f697bf996fd732f042a5c773b1d3af2b 100644 |
| --- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h |
| +++ b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h |
| @@ -50,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, PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault) |
| + static PassOwnPtr<WorkerThreadStartupData> create(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode startMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const SecurityOrigin* starterOrigin, WorkerClients* workerClients, WebAddressSpace addressSpace, const Vector<String>* originTrialTokens, V8CacheOptions v8CacheOptions = V8CacheOptionsDefault) |
|
iclelland
2016/04/28 15:39:22
Why isn't the ownership of originTrialTokens (and
Marijn Kruisselbrink
2016/04/28 17:45:27
It actually never transferred ownership for CSP. U
iclelland
2016/04/28 18:02:52
Got it -- I missed the const ref, but that makes s
|
| { |
| - return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, std::move(cachedMetaData), startMode, std::move(contentSecurityPolicyHeaders), starterOrigin, workerClients, addressSpace, v8CacheOptions)); |
| + return adoptPtr(new WorkerThreadStartupData(scriptURL, userAgent, sourceCode, cachedMetaData, startMode, contentSecurityPolicyHeaders, starterOrigin, workerClients, addressSpace, originTrialTokens, v8CacheOptions)); |
| } |
| ~WorkerThreadStartupData(); |
| @@ -63,6 +63,7 @@ public: |
| OwnPtr<Vector<char>> m_cachedMetaData; |
| WorkerThreadStartMode m_startMode; |
| OwnPtr<Vector<CSPHeaderAndType>> m_contentSecurityPolicyHeaders; |
| + std::unique_ptr<Vector<String>> m_originTrialTokens; |
| // The SecurityOrigin of the Document creating a Worker may have |
| @@ -91,7 +92,7 @@ public: |
| V8CacheOptions m_v8CacheOptions; |
| private: |
| - WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, PassOwnPtr<Vector<CSPHeaderAndType>> contentSecurityPolicyHeaders, const SecurityOrigin*, WorkerClients*, WebAddressSpace, V8CacheOptions); |
| + WorkerThreadStartupData(const KURL& scriptURL, const String& userAgent, const String& sourceCode, PassOwnPtr<Vector<char>> cachedMetaData, WorkerThreadStartMode, const Vector<CSPHeaderAndType>* contentSecurityPolicyHeaders, const SecurityOrigin*, WorkerClients*, WebAddressSpace, const Vector<String>* originTrialTokens, V8CacheOptions); |
| }; |
| } // namespace blink |