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

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

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
Index: third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp
index 5b23337a67e10a98c1b7a18a4b16d0a91066988a..e9b767cab9c20e63b7977043bd91fffee057ec72 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThreadStartupData.cpp
@@ -34,7 +34,7 @@
namespace blink {
-WorkerThreadStartupData::WorkerThreadStartupData(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)
+WorkerThreadStartupData::WorkerThreadStartupData(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)
: m_scriptURL(scriptURL.copy())
, m_userAgent(userAgent.isolatedCopy())
, m_sourceCode(sourceCode.isolatedCopy())
@@ -46,12 +46,17 @@ WorkerThreadStartupData::WorkerThreadStartupData(const KURL& scriptURL, const St
, m_v8CacheOptions(v8CacheOptions)
{
m_contentSecurityPolicyHeaders = adoptPtr(new Vector<CSPHeaderAndType>());
- if (!contentSecurityPolicyHeaders)
- return;
+ if (contentSecurityPolicyHeaders) {
+ for (const auto& header : *contentSecurityPolicyHeaders) {
+ CSPHeaderAndType copiedHeader(header.first.isolatedCopy(), header.second);
+ m_contentSecurityPolicyHeaders->append(copiedHeader);
+ }
+ }
- for (const auto& header : *contentSecurityPolicyHeaders) {
- CSPHeaderAndType copiedHeader(header.first.isolatedCopy(), header.second);
- m_contentSecurityPolicyHeaders->append(copiedHeader);
+ m_originTrialTokens = std::unique_ptr<Vector<String>>(new Vector<String>());
+ if (originTrialTokens) {
+ for (const String& token : *originTrialTokens)
+ m_originTrialTokens->append(token.isolatedCopy());
}
}

Powered by Google App Engine
This is Rietveld 408576698