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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 m_client->workerScriptLoadFailed(); | 319 m_client->workerScriptLoadFailed(); |
320 | 320 |
321 // The SharedWorker was unable to load the initial script, so | 321 // The SharedWorker was unable to load the initial script, so |
322 // shut it down right here. | 322 // shut it down right here. |
323 delete this; | 323 delete this; |
324 return; | 324 return; |
325 } | 325 } |
326 | 326 |
327 Document* document = m_mainFrame->frame()->document(); | 327 Document* document = m_mainFrame->frame()->document(); |
328 // FIXME: this document's origin is pristine and without any extra privilege
s. (crbug.com/254993) | 328 // FIXME: this document's origin is pristine and without any extra privilege
s. (crbug.com/254993) |
329 SecurityOrigin* starterOrigin = document->securityOrigin(); | 329 SecurityOrigin* starterOrigin = document->getSecurityOrigin(); |
330 | 330 |
331 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create(); | 331 OwnPtrWillBeRawPtr<WorkerClients> workerClients = WorkerClients::create(); |
332 provideLocalFileSystemToWorker(workerClients.get(), LocalFileSystemClient::c
reate()); | 332 provideLocalFileSystemToWorker(workerClients.get(), LocalFileSystemClient::c
reate()); |
333 WebSecurityOrigin webSecurityOrigin(m_loadingDocument->securityOrigin()); | 333 WebSecurityOrigin webSecurityOrigin(m_loadingDocument->getSecurityOrigin()); |
334 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(m_client-
>createWorkerContentSettingsClientProxy(webSecurityOrigin))); | 334 provideContentSettingsClientToWorker(workerClients.get(), adoptPtr(m_client-
>createWorkerContentSettingsClientProxy(webSecurityOrigin))); |
335 RefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy = m_mainScri
ptLoader->releaseContentSecurityPolicy(); | 335 RefPtrWillBeRawPtr<ContentSecurityPolicy> contentSecurityPolicy = m_mainScri
ptLoader->releaseContentSecurityPolicy(); |
336 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do
cument); | 336 WorkerThreadStartMode startMode = m_workerInspectorProxy->workerStartMode(do
cument); |
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, |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 if (devtoolsAgent) | 394 if (devtoolsAgent) |
395 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message); | 395 devtoolsAgent->dispatchOnInspectorBackend(sessionId, message); |
396 } | 396 } |
397 | 397 |
398 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) | 398 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) |
399 { | 399 { |
400 return new WebSharedWorkerImpl(client); | 400 return new WebSharedWorkerImpl(client); |
401 } | 401 } |
402 | 402 |
403 } // namespace blink | 403 } // namespace blink |
OLD | NEW |