third_party/WebKit/Source/core/workers/WorkerThreadStartupData.h - Issue 1828063002: Add support for origin trials in workers.

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

Issue 1828063002: Add support for origin trials in workers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@trial-token-in-header-blink-document

Patch Set: fix test flakyness Created 4 years, 7 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

« no previous file with comments | « third_party/WebKit/Source/core/workers/WorkerScriptLoader.cpp ('k') | third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..fb5fad73b00ffe41221b159b052cd6f727745d88 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)

{

- 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, std::move(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