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

Side by Side Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.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: address comments 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 provideContentSettingsClientToWorker(workerClients, adoptPtr(m_client->creat eWorkerContentSettingsClientProxy(webSecurityOrigin))); 330 provideContentSettingsClientToWorker(workerClients, adoptPtr(m_client->creat eWorkerContentSettingsClientProxy(webSecurityOrigin)));
331 provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create()) ; 331 provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create()) ;
332 ContentSecurityPolicy* contentSecurityPolicy = m_mainScriptLoader->releaseCo ntentSecurityPolicy(); 332 ContentSecurityPolicy* contentSecurityPolicy = m_mainScriptLoader->releaseCo ntentSecurityPolicy();
333 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do cument); 333 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do cument);
334 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e( 334 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e(
335 m_url, 335 m_url,
336 m_loadingDocument->userAgent(), 336 m_loadingDocument->userAgent(),
337 m_mainScriptLoader->script(), 337 m_mainScriptLoader->script(),
338 nullptr, 338 nullptr,
339 startMode, 339 startMode,
340 contentSecurityPolicy ? contentSecurityPolicy->headers() : nullptr, 340 contentSecurityPolicy ? contentSecurityPolicy->headers().get() : nullptr ,
341 starterOrigin, 341 starterOrigin,
342 workerClients, 342 workerClients,
343 m_mainScriptLoader->responseAddressSpace()); 343 m_mainScriptLoader->responseAddressSpace(),
344 m_mainScriptLoader->originTrialTokens());
344 m_loaderProxy = WorkerLoaderProxy::create(this); 345 m_loaderProxy = WorkerLoaderProxy::create(this);
345 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this); 346 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this);
346 InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScri ptLoader->identifier(), m_mainScriptLoader->script()); 347 InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScri ptLoader->identifier(), m_mainScriptLoader->script());
347 m_mainScriptLoader.clear(); 348 m_mainScriptLoader.clear();
348 349
349 workerThread()->start(startupData.release()); 350 workerThread()->start(startupData.release());
350 m_workerInspectorProxy->workerThreadCreated(toDocument(m_loadingDocument.get ()), workerThread(), m_url); 351 m_workerInspectorProxy->workerThreadCreated(toDocument(m_loadingDocument.get ()), workerThread(), m_url);
351 m_client->workerScriptLoaded(); 352 m_client->workerScriptLoaded();
352 } 353 }
353 354
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 if (devtoolsAgent) 392 if (devtoolsAgent)
392 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message); 393 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message);
393 } 394 }
394 395
395 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) 396 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client)
396 { 397 {
397 return new WebSharedWorkerImpl(client); 398 return new WebSharedWorkerImpl(client);
398 } 399 }
399 400
400 } // namespace blink 401 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698