| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 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 "core/loader/WorkerThreadableLoader.h" | 31 #include "core/loader/WorkerThreadableLoader.h" |
| 32 | 32 |
| 33 #include "core/dom/Document.h" | 33 #include <memory> |
| 34 #include "core/loader/DocumentThreadableLoader.h" | 34 #include "core/loader/DocumentThreadableLoader.h" |
| 35 #include "core/loader/ThreadableLoadingContext.h" |
| 35 #include "core/timing/WorkerGlobalScopePerformance.h" | 36 #include "core/timing/WorkerGlobalScopePerformance.h" |
| 36 #include "core/workers/WorkerGlobalScope.h" | 37 #include "core/workers/WorkerGlobalScope.h" |
| 37 #include "core/workers/WorkerLoaderProxy.h" | 38 #include "core/workers/WorkerLoaderProxy.h" |
| 38 #include "platform/CrossThreadFunctional.h" | 39 #include "platform/CrossThreadFunctional.h" |
| 39 #include "platform/heap/SafePoint.h" | 40 #include "platform/heap/SafePoint.h" |
| 40 #include "platform/network/ResourceError.h" | 41 #include "platform/network/ResourceError.h" |
| 41 #include "platform/network/ResourceRequest.h" | 42 #include "platform/network/ResourceRequest.h" |
| 42 #include "platform/network/ResourceResponse.h" | 43 #include "platform/network/ResourceResponse.h" |
| 43 #include "platform/network/ResourceTimingInfo.h" | 44 #include "platform/network/ResourceTimingInfo.h" |
| 44 #include "platform/weborigin/KURL.h" | 45 #include "platform/weborigin/KURL.h" |
| 45 #include "platform/weborigin/SecurityPolicy.h" | 46 #include "platform/weborigin/SecurityPolicy.h" |
| 46 #include "wtf/Functional.h" | 47 #include "wtf/Functional.h" |
| 47 #include "wtf/debug/Alias.h" | 48 #include "wtf/debug/Alias.h" |
| 48 #include <memory> | |
| 49 | 49 |
| 50 namespace blink { | 50 namespace blink { |
| 51 | 51 |
| 52 namespace { | 52 namespace { |
| 53 | 53 |
| 54 std::unique_ptr<Vector<char>> createVectorFromMemoryRegion( | 54 std::unique_ptr<Vector<char>> createVectorFromMemoryRegion( |
| 55 const char* data, | 55 const char* data, |
| 56 unsigned dataLength) { | 56 unsigned dataLength) { |
| 57 std::unique_ptr<Vector<char>> buffer = | 57 std::unique_ptr<Vector<char>> buffer = |
| 58 WTF::makeUnique<Vector<char>>(dataLength); | 58 WTF::makeUnique<Vector<char>>(dataLength); |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 429 WorkerThreadableLoader* workerLoader, | 429 WorkerThreadableLoader* workerLoader, |
| 430 PassRefPtr<WorkerLoaderProxy> passLoaderProxy, | 430 PassRefPtr<WorkerLoaderProxy> passLoaderProxy, |
| 431 WorkerThreadLifecycleContext* workerThreadLifecycleContext, | 431 WorkerThreadLifecycleContext* workerThreadLifecycleContext, |
| 432 std::unique_ptr<CrossThreadResourceRequestData> request, | 432 std::unique_ptr<CrossThreadResourceRequestData> request, |
| 433 const ThreadableLoaderOptions& options, | 433 const ThreadableLoaderOptions& options, |
| 434 const ResourceLoaderOptions& resourceLoaderOptions, | 434 const ResourceLoaderOptions& resourceLoaderOptions, |
| 435 PassRefPtr<WaitableEventWithTasks> eventWithTasks) { | 435 PassRefPtr<WaitableEventWithTasks> eventWithTasks) { |
| 436 DCHECK(isMainThread()); | 436 DCHECK(isMainThread()); |
| 437 TaskForwarder* forwarder; | 437 TaskForwarder* forwarder; |
| 438 RefPtr<WorkerLoaderProxy> loaderProxy = passLoaderProxy; | 438 RefPtr<WorkerLoaderProxy> loaderProxy = passLoaderProxy; |
| 439 ExecutionContext* loaderContext = loaderProxy->getLoaderExecutionContext(); | 439 ThreadableLoadingContext* loadingContext = |
| 440 if (!loaderContext) | 440 loaderProxy->getThreadableLoadingContext(); |
| 441 if (!loadingContext) |
| 441 return; | 442 return; |
| 442 if (eventWithTasks) | 443 if (eventWithTasks) |
| 443 forwarder = new SyncTaskForwarder(std::move(eventWithTasks)); | 444 forwarder = new SyncTaskForwarder(std::move(eventWithTasks)); |
| 444 else | 445 else |
| 445 forwarder = new AsyncTaskForwarder(loaderProxy); | 446 forwarder = new AsyncTaskForwarder(loaderProxy); |
| 446 | 447 |
| 447 MainThreadLoaderHolder* mainThreadLoaderHolder = | 448 MainThreadLoaderHolder* mainThreadLoaderHolder = |
| 448 new MainThreadLoaderHolder(forwarder, workerThreadLifecycleContext); | 449 new MainThreadLoaderHolder(forwarder, workerThreadLifecycleContext); |
| 449 if (mainThreadLoaderHolder->wasContextDestroyedBeforeObserverCreation()) { | 450 if (mainThreadLoaderHolder->wasContextDestroyedBeforeObserverCreation()) { |
| 450 // The thread is already terminating. | 451 // The thread is already terminating. |
| 451 forwarder->abort(); | 452 forwarder->abort(); |
| 452 mainThreadLoaderHolder->m_forwarder = nullptr; | 453 mainThreadLoaderHolder->m_forwarder = nullptr; |
| 453 return; | 454 return; |
| 454 } | 455 } |
| 455 mainThreadLoaderHolder->m_workerLoader = workerLoader; | 456 mainThreadLoaderHolder->m_workerLoader = workerLoader; |
| 456 forwarder->forwardTask( | 457 forwarder->forwardTask( |
| 457 BLINK_FROM_HERE, | 458 BLINK_FROM_HERE, |
| 458 crossThreadBind(&WorkerThreadableLoader::didStart, | 459 crossThreadBind(&WorkerThreadableLoader::didStart, |
| 459 wrapCrossThreadPersistent(workerLoader), | 460 wrapCrossThreadPersistent(workerLoader), |
| 460 wrapCrossThreadPersistent(mainThreadLoaderHolder))); | 461 wrapCrossThreadPersistent(mainThreadLoaderHolder))); |
| 461 mainThreadLoaderHolder->start(*toDocument(loaderContext), std::move(request), | 462 mainThreadLoaderHolder->start(*loadingContext, std::move(request), options, |
| 462 options, resourceLoaderOptions); | 463 resourceLoaderOptions); |
| 463 } | 464 } |
| 464 | 465 |
| 465 WorkerThreadableLoader::MainThreadLoaderHolder::~MainThreadLoaderHolder() { | 466 WorkerThreadableLoader::MainThreadLoaderHolder::~MainThreadLoaderHolder() { |
| 466 DCHECK(isMainThread()); | 467 DCHECK(isMainThread()); |
| 467 DCHECK(!m_workerLoader); | 468 DCHECK(!m_workerLoader); |
| 468 } | 469 } |
| 469 | 470 |
| 470 void WorkerThreadableLoader::MainThreadLoaderHolder::overrideTimeout( | 471 void WorkerThreadableLoader::MainThreadLoaderHolder::overrideTimeout( |
| 471 unsigned long timeoutMilliseconds) { | 472 unsigned long timeoutMilliseconds) { |
| 472 DCHECK(isMainThread()); | 473 DCHECK(isMainThread()); |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 } | 654 } |
| 654 | 655 |
| 655 WorkerThreadableLoader::MainThreadLoaderHolder::MainThreadLoaderHolder( | 656 WorkerThreadableLoader::MainThreadLoaderHolder::MainThreadLoaderHolder( |
| 656 TaskForwarder* forwarder, | 657 TaskForwarder* forwarder, |
| 657 WorkerThreadLifecycleContext* context) | 658 WorkerThreadLifecycleContext* context) |
| 658 : WorkerThreadLifecycleObserver(context), m_forwarder(forwarder) { | 659 : WorkerThreadLifecycleObserver(context), m_forwarder(forwarder) { |
| 659 DCHECK(isMainThread()); | 660 DCHECK(isMainThread()); |
| 660 } | 661 } |
| 661 | 662 |
| 662 void WorkerThreadableLoader::MainThreadLoaderHolder::start( | 663 void WorkerThreadableLoader::MainThreadLoaderHolder::start( |
| 663 Document& document, | 664 ThreadableLoadingContext& loadingContext, |
| 664 std::unique_ptr<CrossThreadResourceRequestData> request, | 665 std::unique_ptr<CrossThreadResourceRequestData> request, |
| 665 const ThreadableLoaderOptions& options, | 666 const ThreadableLoaderOptions& options, |
| 666 const ResourceLoaderOptions& originalResourceLoaderOptions) { | 667 const ResourceLoaderOptions& originalResourceLoaderOptions) { |
| 667 DCHECK(isMainThread()); | 668 DCHECK(isMainThread()); |
| 668 ResourceLoaderOptions resourceLoaderOptions = originalResourceLoaderOptions; | 669 ResourceLoaderOptions resourceLoaderOptions = originalResourceLoaderOptions; |
| 669 resourceLoaderOptions.requestInitiatorContext = WorkerContext; | 670 resourceLoaderOptions.requestInitiatorContext = WorkerContext; |
| 670 m_mainThreadLoader = DocumentThreadableLoader::create(document, this, options, | 671 m_mainThreadLoader = DocumentThreadableLoader::create( |
| 671 resourceLoaderOptions); | 672 loadingContext, this, options, resourceLoaderOptions); |
| 672 m_mainThreadLoader->start(ResourceRequest(request.get())); | 673 m_mainThreadLoader->start(ResourceRequest(request.get())); |
| 673 } | 674 } |
| 674 | 675 |
| 675 } // namespace blink | 676 } // namespace blink |
| OLD | NEW |