| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "web/WebEmbeddedWorkerImpl.h" | 31 #include "web/WebEmbeddedWorkerImpl.h" |
| 32 | 32 |
| 33 #include "core/dom/CrossThreadTask.h" | 33 #include "core/dom/CrossThreadTask.h" |
| 34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
| 35 #include "core/dom/SecurityContext.h" |
| 35 #include "core/fetch/SubstituteData.h" | 36 #include "core/fetch/SubstituteData.h" |
| 36 #include "core/frame/csp/ContentSecurityPolicy.h" | 37 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 37 #include "core/inspector/InspectorInstrumentation.h" | 38 #include "core/inspector/InspectorInstrumentation.h" |
| 38 #include "core/inspector/WorkerDebuggerAgent.h" | 39 #include "core/inspector/WorkerDebuggerAgent.h" |
| 39 #include "core/inspector/WorkerInspectorController.h" | 40 #include "core/inspector/WorkerInspectorController.h" |
| 40 #include "core/loader/FrameLoadRequest.h" | 41 #include "core/loader/FrameLoadRequest.h" |
| 41 #include "core/workers/WorkerClients.h" | 42 #include "core/workers/WorkerClients.h" |
| 42 #include "core/workers/WorkerGlobalScope.h" | 43 #include "core/workers/WorkerGlobalScope.h" |
| 43 #include "core/workers/WorkerInspectorProxy.h" | 44 #include "core/workers/WorkerInspectorProxy.h" |
| 44 #include "core/workers/WorkerLoaderProxy.h" | 45 #include "core/workers/WorkerLoaderProxy.h" |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 KURL scriptURL = m_mainScriptLoader->url(); | 364 KURL scriptURL = m_mainScriptLoader->url(); |
| 364 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat
e( | 365 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat
e( |
| 365 scriptURL, | 366 scriptURL, |
| 366 m_workerStartData.userAgent, | 367 m_workerStartData.userAgent, |
| 367 m_mainScriptLoader->script(), | 368 m_mainScriptLoader->script(), |
| 368 m_mainScriptLoader->releaseCachedMetadata(), | 369 m_mainScriptLoader->releaseCachedMetadata(), |
| 369 startMode, | 370 startMode, |
| 370 document->contentSecurityPolicy()->headers(), | 371 document->contentSecurityPolicy()->headers(), |
| 371 starterOrigin, | 372 starterOrigin, |
| 372 workerClients.release(), | 373 workerClients.release(), |
| 374 m_mainScriptLoader->responseAddressSpace(), |
| 373 static_cast<V8CacheOptions>(m_workerStartData.v8CacheOptions)); | 375 static_cast<V8CacheOptions>(m_workerStartData.v8CacheOptions)); |
| 374 | 376 |
| 375 m_mainScriptLoader.clear(); | 377 m_mainScriptLoader.clear(); |
| 376 | 378 |
| 377 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); | 379 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); |
| 378 m_loaderProxy = WorkerLoaderProxy::create(this); | 380 m_loaderProxy = WorkerLoaderProxy::create(this); |
| 379 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); | 381 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); |
| 380 m_workerThread->start(startupData.release()); | 382 m_workerThread->start(startupData.release()); |
| 381 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); | 383 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); |
| 382 } | 384 } |
| 383 | 385 |
| 384 } // namespace blink | 386 } // namespace blink |
| OLD | NEW |