| OLD | NEW |
| 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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(m_client-
>createWorkerContentSettingsClientProxy(webSecurityOrigin))); | 335 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(m_client-
>createWorkerContentSettingsClientProxy(webSecurityOrigin))); |
| 336 RefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy = m_mainScri
ptLoader->releaseContentSecurityPolicy(); | 336 RefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy = m_mainScri
ptLoader->releaseContentSecurityPolicy(); |
| 337 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat
e( | 337 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat
e( |
| 338 m_url, | 338 m_url, |
| 339 m_loadingDocument->userAgent(), | 339 m_loadingDocument->userAgent(), |
| 340 m_mainScriptLoader->script(), | 340 m_mainScriptLoader->script(), |
| 341 nullptr, | 341 nullptr, |
| 342 startMode, | 342 startMode, |
| 343 contentSecurityPolicy ? contentSecurityPolicy->headers() : nullptr, | 343 contentSecurityPolicy ? contentSecurityPolicy->headers() : nullptr, |
| 344 starterOrigin, | 344 starterOrigin, |
| 345 workerClients.release()); | 345 workerClients.release(), |
| 346 m_mainScriptLoader->responseAddressSpace()); |
| 346 m_loaderProxy = WorkerLoaderProxy::create(this); | 347 m_loaderProxy = WorkerLoaderProxy::create(this); |
| 347 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this); | 348 m_workerThread = SharedWorkerThread::create(m_name, m_loaderProxy, *this); |
| 348 InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScri
ptLoader->identifier(), m_mainScriptLoader->script()); | 349 InspectorInstrumentation::scriptImported(m_loadingDocument.get(), m_mainScri
ptLoader->identifier(), m_mainScriptLoader->script()); |
| 349 m_mainScriptLoader.clear(); | 350 m_mainScriptLoader.clear(); |
| 350 | 351 |
| 351 workerThread()->start(startupData.release()); | 352 workerThread()->start(startupData.release()); |
| 352 m_workerInspectorProxy->workerThreadCreated(m_loadingDocument.get(), workerT
hread(), m_url); | 353 m_workerInspectorProxy->workerThreadCreated(m_loadingDocument.get(), workerT
hread(), m_url); |
| 353 m_client->workerScriptLoaded(); | 354 m_client->workerScriptLoaded(); |
| 354 } | 355 } |
| 355 | 356 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 393 if (devtoolsAgent) | 394 if (devtoolsAgent) |
| 394 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message); | 395 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message); |
| 395 } | 396 } |
| 396 | 397 |
| 397 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) | 398 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) |
| 398 { | 399 { |
| 399 return new WebSharedWorkerImpl(client); | 400 return new WebSharedWorkerImpl(client); |
| 400 } | 401 } |
| 401 | 402 |
| 402 } // namespace blink | 403 } // namespace blink |
| OLD | NEW |