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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.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

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

Index: third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

diff --git a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

index ca72ac31a2b5ad48ea9f987f8510351cfb361cb8..902528ec58766383d6d7b48a2851dcded7565f97 100644

--- a/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

+++ b/third_party/WebKit/Source/core/workers/DedicatedWorkerGlobalScope.cpp

@@ -36,6 +36,7 @@

#include "core/frame/Deprecation.h"

#include "core/frame/UseCounter.h"

#include "core/frame/csp/ContentSecurityPolicy.h"

+#include "core/origin_trials/OriginTrialContext.h"

#include "core/workers/DedicatedWorkerThread.h"

#include "core/workers/InProcessWorkerObjectProxy.h"

#include "core/workers/WorkerClients.h"

@@ -50,6 +51,7 @@ DedicatedWorkerGlobalScope* DedicatedWorkerGlobalScope::create(DedicatedWorkerTh

DedicatedWorkerGlobalScope* context = new DedicatedWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgent, thread, timeOrigin, startupData->m_starterOriginPrivilegeData.release(), startupData->m_workerClients.release());

context->applyContentSecurityPolicyFromVector(*startupData->m_contentSecurityPolicyHeaders);

context->setAddressSpace(startupData->m_addressSpace);

+ OriginTrialContext::addTokens(context, startupData->m_originTrialTokens.get());

return context;

}