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

Side by Side Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 provideContentSettingsClientToWorker(workerClients, adoptPtr(m_client->creat eWorkerContentSettingsClientProxy(webSecurityOrigin))); 331 provideContentSettingsClientToWorker(workerClients, adoptPtr(m_client->creat eWorkerContentSettingsClientProxy(webSecurityOrigin)));
332 provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create()) ; 332 provideIndexedDBClientToWorker(workerClients, IndexedDBClientImpl::create()) ;
333 ContentSecurityPolicy* contentSecurityPolicy = m_mainScriptLoader->releaseCo ntentSecurityPolicy(); 333 ContentSecurityPolicy* contentSecurityPolicy = m_mainScriptLoader->releaseCo ntentSecurityPolicy();
334 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do cument); 334 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do cument);
335 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e( 335 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e(
336 m_url, 336 m_url,
337 m_loadingDocument->userAgent(), 337 m_loadingDocument->userAgent(),
338 m_mainScriptLoader->script(), 338 m_mainScriptLoader->script(),
339 nullptr, 339 nullptr,
340 startMode, 340 startMode,
341 contentSecurityPolicy ? contentSecurityPolicy->headers().get() : nullptr , 341 contentSecurityPolicy ? contentSecurityPolicy->headers() : nullptr,
342 starterOrigin, 342 starterOrigin,
343 workerClients, 343 workerClients,
344 m_mainScriptLoader->responseAddressSpace(), 344 m_mainScriptLoader->responseAddressSpace());
345 m_mainScriptLoader->originTrialTokens());
346 m_loaderProxy = WorkerLoaderProxy::create(this); 345 m_loaderProxy = WorkerLoaderProxy::create(this);
347 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this); 346 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this);
348 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());
349 m_mainScriptLoader.clear(); 348 m_mainScriptLoader.clear();
350 349
351 workerThread()->start(startupData.release()); 350 workerThread()->start(startupData.release());
352 m_workerInspectorProxy->workerThreadCreated(toDocument(m_loadingDocument.get ()), workerThread(), m_url); 351 m_workerInspectorProxy->workerThreadCreated(toDocument(m_loadingDocument.get ()), workerThread(), m_url);
353 m_client->workerScriptLoaded(); 352 m_client->workerScriptLoaded();
354 } 353 }
355 354
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
393 if (devtoolsAgent) 392 if (devtoolsAgent)
394 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, mes sage); 393 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, mes sage);
395 } 394 }
396 395
397 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) 396 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client)
398 { 397 {
399 return new WebSharedWorkerImpl(client); 398 return new WebSharedWorkerImpl(client);
400 } 399 }
401 400
402 } // namespace blink 401 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698