Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: third_party/WebKit/Source/modules/serviceworkers/ServiceWorkerThread.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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>
38 36
39 namespace blink { 37 namespace blink {
40 38
41 std::unique_ptr<ServiceWorkerThread> ServiceWorkerThread::create(PassRefPtr<Work erLoaderProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy) 39 PassOwnPtr<ServiceWorkerThread> ServiceWorkerThread::create(PassRefPtr<WorkerLoa derProxy> workerLoaderProxy, WorkerReportingProxy& workerReportingProxy)
42 { 40 {
43 return wrapUnique(new ServiceWorkerThread(workerLoaderProxy, workerReporting Proxy)); 41 return adoptPtr(new ServiceWorkerThread(workerLoaderProxy, workerReportingPr oxy));
44 } 42 }
45 43
46 ServiceWorkerThread::ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoa derProxy, WorkerReportingProxy& workerReportingProxy) 44 ServiceWorkerThread::ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy> workerLoa derProxy, WorkerReportingProxy& workerReportingProxy)
47 : WorkerThread(workerLoaderProxy, workerReportingProxy) 45 : WorkerThread(workerLoaderProxy, workerReportingProxy)
48 , m_workerBackingThread(WorkerBackingThread::create("ServiceWorker Thread")) 46 , m_workerBackingThread(WorkerBackingThread::create("ServiceWorker Thread"))
49 { 47 {
50 } 48 }
51 49
52 ServiceWorkerThread::~ServiceWorkerThread() 50 ServiceWorkerThread::~ServiceWorkerThread()
53 { 51 {
54 } 52 }
55 53
56 WorkerGlobalScope* ServiceWorkerThread::createWorkerGlobalScope(std::unique_ptr< WorkerThreadStartupData> startupData) 54 WorkerGlobalScope* ServiceWorkerThread::createWorkerGlobalScope(PassOwnPtr<Worke rThreadStartupData> startupData)
57 { 55 {
58 return ServiceWorkerGlobalScope::create(this, std::move(startupData)); 56 return ServiceWorkerGlobalScope::create(this, std::move(startupData));
59 } 57 }
60 58
61 } // namespace blink 59 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698