| 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 15 matching lines...) Expand all Loading... |
| 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 "modules/serviceworkers/ServiceWorkerThread.h" | 31 #include "modules/serviceworkers/ServiceWorkerThread.h" |
| 32 | 32 |
| 33 #include "core/workers/WorkerBackingThread.h" | 33 #include "core/workers/WorkerBackingThread.h" |
| 34 #include "core/workers/WorkerThreadStartupData.h" | 34 #include "core/workers/WorkerThreadStartupData.h" |
| 35 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h" | 35 #include "modules/serviceworkers/ServiceWorkerGlobalScope.h" |
| 36 #include "wtf/PtrUtil.h" |
| 37 #include <memory> |
| 36 | 38 |
| 37 namespace blink { | 39 namespace blink { |
| 38 | 40 |
| 39 PassOwnPtr<ServiceWorkerThread> ServiceWorkerThread::create(PassRefPtr<WorkerLoa
derProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy) | 41 std::unique_ptr<ServiceWorkerThread> ServiceWorkerThread::create(PassRefPtr<Work
erLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy) |
| 40 { | 42 { |
| 41 return adoptPtr(new ServiceWorkerThread(workerLoaderProxy, workerReportingPr
oxy)); | 43 return wrapUnique(new ServiceWorkerThread(workerLoaderProxy, workerReporting
Proxy)); |
| 42 } | 44 } |
| 43 | 45 |
| 44 ServiceWorkerThread::ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoa
derProxy, WorkerReportingProxy& workerReportingProxy) | 46 ServiceWorkerThread::ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoa
derProxy, WorkerReportingProxy& workerReportingProxy) |
| 45 : WorkerThread(workerLoaderProxy, workerReportingProxy) | 47 : WorkerThread(workerLoaderProxy, workerReportingProxy) |
| 46 , m_workerBackingThread(WorkerBackingThread::create("ServiceWorker Thread")) | 48 , m_workerBackingThread(WorkerBackingThread::create("ServiceWorker Thread")) |
| 47 { | 49 { |
| 48 } | 50 } |
| 49 | 51 |
| 50 ServiceWorkerThread::~ServiceWorkerThread() | 52 ServiceWorkerThread::~ServiceWorkerThread() |
| 51 { | 53 { |
| 52 } | 54 } |
| 53 | 55 |
| 54 WorkerGlobalScope* ServiceWorkerThread::createWorkerGlobalScope(PassOwnPtr<Worke
rThreadStartupData> startupData) | 56 WorkerGlobalScope* ServiceWorkerThread::createWorkerGlobalScope(std::unique_ptr<
WorkerThreadStartupData> startupData) |
| 55 { | 57 { |
| 56 return ServiceWorkerGlobalScope::create(this, std::move(startupData)); | 58 return ServiceWorkerGlobalScope::create(this, std::move(startupData)); |
| 57 } | 59 } |
| 58 | 60 |
| 59 } // namespace blink | 61 } // namespace blink |
| OLD | NEW |