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

Unified Diff: third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp

Issue 1969583002: Revert of 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: 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/origin_trials/OriginTrialContext.cpp
diff --git a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
index 50122ea932ea9caa28d19c54541910d02b25ec3e..f4f37fdba24811f0ecf2c555529aede3030cabc1 100644
--- a/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
+++ b/third_party/WebKit/Source/core/origin_trials/OriginTrialContext.cpp
@@ -87,10 +87,10 @@
}
// static
-OriginTrialContext* OriginTrialContext::from(ExecutionContext* host, CreateMode create)
+OriginTrialContext* OriginTrialContext::from(ExecutionContext* host)
{
OriginTrialContext* originTrials = static_cast<OriginTrialContext*>(Supplement<ExecutionContext>::from(host, supplementName()));
- if (!originTrials && create == CreateIfNotExists) {
+ if (!originTrials) {
originTrials = new OriginTrialContext(host);
Supplement<ExecutionContext>::provideTo(*host, supplementName(), originTrials);
}
@@ -122,36 +122,16 @@
std::unique_ptr<Vector<String>> tokens(parseHeaderValue(headerValue));
if (!tokens)
return;
- addTokens(host, parseHeaderValue(headerValue).get());
-}
-
-// static
-void OriginTrialContext::addTokens(ExecutionContext* host, const Vector<String>* tokens)
-{
- if (!tokens || tokens->isEmpty())
- return;
- from(host)->addTokens(*tokens);
-}
-
-// static
-std::unique_ptr<Vector<String>> OriginTrialContext::getTokens(ExecutionContext* host)
-{
- OriginTrialContext* context = from(host, DontCreateIfNotExists);
- if (!context || context->m_tokens.isEmpty())
- return nullptr;
- return std::unique_ptr<Vector<String>>(new Vector<String>(context->m_tokens));
-}
-
+ OriginTrialContext* context = from(host);
+ for (const String& token : *tokens) {
+ context->addToken(token);
+ }
+}
void OriginTrialContext::addToken(const String& token)
{
if (!token.isEmpty())
m_tokens.append(token);
-}
-
-void OriginTrialContext::addTokens(const Vector<String>& tokens)
-{
- m_tokens.appendVector(tokens);
}
bool OriginTrialContext::isFeatureEnabled(const String& featureName, String* errorMessage, WebTrialTokenValidator* validator)

Powered by Google App Engine
This is Rietveld 408576698