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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. 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 20 matching lines...) Expand all
31 #ifndef ServiceWorker_h 31 #ifndef ServiceWorker_h
32 #define ServiceWorker_h 32 #define ServiceWorker_h
33 33
34 #include "bindings/core/v8/ActiveScriptWrappable.h" 34 #include "bindings/core/v8/ActiveScriptWrappable.h"
35 #include "bindings/core/v8/ScriptPromise.h" 35 #include "bindings/core/v8/ScriptPromise.h"
36 #include "bindings/core/v8/SerializedScriptValue.h" 36 #include "bindings/core/v8/SerializedScriptValue.h"
37 #include "core/workers/AbstractWorker.h" 37 #include "core/workers/AbstractWorker.h"
38 #include "modules/ModulesExport.h" 38 #include "modules/ModulesExport.h"
39 #include "public/platform/modules/serviceworker/WebServiceWorker.h" 39 #include "public/platform/modules/serviceworker/WebServiceWorker.h"
40 #include "public/platform/modules/serviceworker/WebServiceWorkerProxy.h" 40 #include "public/platform/modules/serviceworker/WebServiceWorkerProxy.h"
41 #include "wtf/OwnPtr.h"
42 #include "wtf/PassOwnPtr.h"
43 #include "wtf/PassRefPtr.h" 41 #include "wtf/PassRefPtr.h"
42 #include <memory>
44 43
45 namespace blink { 44 namespace blink {
46 45
47 class ScriptPromiseResolver; 46 class ScriptPromiseResolver;
48 47
49 class MODULES_EXPORT ServiceWorker final : public AbstractWorker, public ActiveS criptWrappable, public WebServiceWorkerProxy { 48 class MODULES_EXPORT ServiceWorker final : public AbstractWorker, public ActiveS criptWrappable, public WebServiceWorkerProxy {
50 DEFINE_WRAPPERTYPEINFO(); 49 DEFINE_WRAPPERTYPEINFO();
51 USING_GARBAGE_COLLECTED_MIXIN(ServiceWorker); 50 USING_GARBAGE_COLLECTED_MIXIN(ServiceWorker);
52 public: 51 public:
53 static ServiceWorker* from(ExecutionContext*, PassOwnPtr<WebServiceWorker::H andle>); 52 static ServiceWorker* from(ExecutionContext*, std::unique_ptr<WebServiceWork er::Handle>);
54 53
55 ~ServiceWorker() override; 54 ~ServiceWorker() override;
56 DECLARE_VIRTUAL_TRACE(); 55 DECLARE_VIRTUAL_TRACE();
57 56
58 // Eager finalization needed to promptly release owned WebServiceWorker. 57 // Eager finalization needed to promptly release owned WebServiceWorker.
59 EAGERLY_FINALIZE(); 58 EAGERLY_FINALIZE();
60 59
61 void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> messag e, const MessagePortArray&, ExceptionState&); 60 void postMessage(ExecutionContext*, PassRefPtr<SerializedScriptValue> messag e, const MessagePortArray&, ExceptionState&);
62 61
63 String scriptURL() const; 62 String scriptURL() const;
64 String state() const; 63 String state() const;
65 DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange); 64 DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange);
66 65
67 // WebServiceWorkerProxy overrides. 66 // WebServiceWorkerProxy overrides.
68 void dispatchStateChangeEvent() override; 67 void dispatchStateChangeEvent() override;
69 68
70 // AbstractWorker overrides. 69 // AbstractWorker overrides.
71 const AtomicString& interfaceName() const override; 70 const AtomicString& interfaceName() const override;
72 71
73 void internalsTerminate(); 72 void internalsTerminate();
74 private: 73 private:
75 static ServiceWorker* getOrCreate(ExecutionContext*, PassOwnPtr<WebServiceWo rker::Handle>); 74 static ServiceWorker* getOrCreate(ExecutionContext*, std::unique_ptr<WebServ iceWorker::Handle>);
76 ServiceWorker(ExecutionContext*, PassOwnPtr<WebServiceWorker::Handle>); 75 ServiceWorker(ExecutionContext*, std::unique_ptr<WebServiceWorker::Handle>);
77 76
78 // ActiveScriptWrappable overrides. 77 // ActiveScriptWrappable overrides.
79 bool hasPendingActivity() const final; 78 bool hasPendingActivity() const final;
80 79
81 // ActiveDOMObject overrides. 80 // ActiveDOMObject overrides.
82 void stop() override; 81 void stop() override;
83 82
84 // A handle to the service worker representation in the embedder. 83 // A handle to the service worker representation in the embedder.
85 OwnPtr<WebServiceWorker::Handle> m_handle; 84 std::unique_ptr<WebServiceWorker::Handle> m_handle;
86 bool m_wasStopped; 85 bool m_wasStopped;
87 }; 86 };
88 87
89 } // namespace blink 88 } // namespace blink
90 89
91 #endif // ServiceWorker_h 90 #endif // ServiceWorker_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698