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

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

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 #ifndef ServiceWorkerThread_h 30 #ifndef ServiceWorkerThread_h
31 #define ServiceWorkerThread_h 31 #define ServiceWorkerThread_h
32 32
33 #include "core/frame/csp/ContentSecurityPolicy.h" 33 #include "core/frame/csp/ContentSecurityPolicy.h"
34 #include "core/workers/WorkerThread.h" 34 #include "core/workers/WorkerThread.h"
35 #include "modules/ModulesExport.h" 35 #include "modules/ModulesExport.h"
36 #include <memory>
37 36
38 namespace blink { 37 namespace blink {
39 38
40 class WorkerThreadStartupData; 39 class WorkerThreadStartupData;
41 40
42 class MODULES_EXPORT ServiceWorkerThread final : public WorkerThread { 41 class MODULES_EXPORT ServiceWorkerThread final : public WorkerThread {
43 public: 42 public:
44 static std::unique_ptr<ServiceWorkerThread> create(PassRefPtr<WorkerLoaderPr oxy>, WorkerReportingProxy&); 43 static PassOwnPtr<ServiceWorkerThread> create(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
45 ~ServiceWorkerThread() override; 44 ~ServiceWorkerThread() override;
46 45
47 WorkerBackingThread& workerBackingThread() override { return *m_workerBackin gThread; } 46 WorkerBackingThread& workerBackingThread() override { return *m_workerBackin gThread; }
48 47
49 protected: 48 protected:
50 WorkerGlobalScope* createWorkerGlobalScope(std::unique_ptr<WorkerThreadStart upData>) override; 49 WorkerGlobalScope* createWorkerGlobalScope(PassOwnPtr<WorkerThreadStartupDat a>) override;
51 50
52 private: 51 private:
53 ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&); 52 ServiceWorkerThread(PassRefPtr<WorkerLoaderProxy>, WorkerReportingProxy&);
54 std::unique_ptr<WorkerBackingThread> m_workerBackingThread; 53 OwnPtr<WorkerBackingThread> m_workerBackingThread;
55 }; 54 };
56 55
57 } // namespace blink 56 } // namespace blink
58 57
59 #endif // ServiceWorkerThread_h 58 #endif // ServiceWorkerThread_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698