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

Side by Side Diff: Source/modules/serviceworkers/ServiceWorkerRegistration.h

Issue 630403002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/modules/serviceworkers (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ServiceWorkerRegistration_h 5 #ifndef ServiceWorkerRegistration_h
6 #define ServiceWorkerRegistration_h 6 #define ServiceWorkerRegistration_h
7 7
8 #include "core/dom/ActiveDOMObject.h" 8 #include "core/dom/ActiveDOMObject.h"
9 #include "core/events/EventTarget.h" 9 #include "core/events/EventTarget.h"
10 #include "modules/serviceworkers/ServiceWorker.h" 10 #include "modules/serviceworkers/ServiceWorker.h"
11 #include "public/platform/WebServiceWorkerRegistration.h" 11 #include "public/platform/WebServiceWorkerRegistration.h"
12 #include "public/platform/WebServiceWorkerRegistrationProxy.h" 12 #include "public/platform/WebServiceWorkerRegistrationProxy.h"
13 #include "wtf/OwnPtr.h" 13 #include "wtf/OwnPtr.h"
14 #include "wtf/PassOwnPtr.h" 14 #include "wtf/PassOwnPtr.h"
15 #include "wtf/PassRefPtr.h" 15 #include "wtf/PassRefPtr.h"
16 #include "wtf/RefCounted.h" 16 #include "wtf/RefCounted.h"
17 17
18 namespace blink { 18 namespace blink {
19 19
20 class ScriptPromise; 20 class ScriptPromise;
21 class ScriptPromiseResolver; 21 class ScriptPromiseResolver;
22 class ScriptState; 22 class ScriptState;
23 class WebServiceWorkerProvider; 23 class WebServiceWorkerProvider;
24 24
25 class ServiceWorkerRegistration FINAL 25 class ServiceWorkerRegistration final
26 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<ServiceWo rkerRegistration> 26 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<ServiceWo rkerRegistration>
27 , public ActiveDOMObject 27 , public ActiveDOMObject
28 , public EventTargetWithInlineData 28 , public EventTargetWithInlineData
29 , public WebServiceWorkerRegistrationProxy { 29 , public WebServiceWorkerRegistrationProxy {
30 DEFINE_WRAPPERTYPEINFO(); 30 DEFINE_WRAPPERTYPEINFO();
31 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S erviceWorkerRegistration>); 31 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S erviceWorkerRegistration>);
32 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration); 32 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
33 public: 33 public:
34 // EventTarget overrides. 34 // EventTarget overrides.
35 virtual const AtomicString& interfaceName() const OVERRIDE; 35 virtual const AtomicString& interfaceName() const override;
36 virtual ExecutionContext* executionContext() const OVERRIDE { return ActiveD OMObject::executionContext(); } 36 virtual ExecutionContext* executionContext() const override { return ActiveD OMObject::executionContext(); }
37 37
38 // WebServiceWorkerRegistrationProxy overrides. 38 // WebServiceWorkerRegistrationProxy overrides.
39 virtual void dispatchUpdateFoundEvent() OVERRIDE; 39 virtual void dispatchUpdateFoundEvent() override;
40 virtual void setInstalling(WebServiceWorker*) OVERRIDE; 40 virtual void setInstalling(WebServiceWorker*) override;
41 virtual void setWaiting(WebServiceWorker*) OVERRIDE; 41 virtual void setWaiting(WebServiceWorker*) override;
42 virtual void setActive(WebServiceWorker*) OVERRIDE; 42 virtual void setActive(WebServiceWorker*) override;
43 43
44 // For CallbackPromiseAdapter. 44 // For CallbackPromiseAdapter.
45 typedef WebServiceWorkerRegistration WebType; 45 typedef WebServiceWorkerRegistration WebType;
46 static ServiceWorkerRegistration* from(ExecutionContext*, WebType* registrat ion); 46 static ServiceWorkerRegistration* from(ExecutionContext*, WebType* registrat ion);
47 static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebType* regi stration); 47 static ServiceWorkerRegistration* take(ScriptPromiseResolver*, WebType* regi stration);
48 static void dispose(WebType* registration); 48 static void dispose(WebType* registration);
49 49
50 PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get (); } 50 PassRefPtrWillBeRawPtr<ServiceWorker> installing() { return m_installing.get (); }
51 PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); } 51 PassRefPtrWillBeRawPtr<ServiceWorker> waiting() { return m_waiting.get(); }
52 PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); } 52 PassRefPtrWillBeRawPtr<ServiceWorker> active() { return m_active.get(); }
53 53
54 String scope() const; 54 String scope() const;
55 55
56 ScriptPromise unregister(ScriptState*); 56 ScriptPromise unregister(ScriptState*);
57 57
58 DEFINE_ATTRIBUTE_EVENT_LISTENER(updatefound); 58 DEFINE_ATTRIBUTE_EVENT_LISTENER(updatefound);
59 59
60 virtual void trace(Visitor*) OVERRIDE; 60 virtual void trace(Visitor*) override;
61 61
62 private: 62 private:
63 static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceW orkerRegistration*); 63 static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceW orkerRegistration*);
64 ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegi stration>); 64 ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegi stration>);
65 65
66 // ActiveDOMObject overrides. 66 // ActiveDOMObject overrides.
67 virtual bool hasPendingActivity() const OVERRIDE; 67 virtual bool hasPendingActivity() const override;
68 virtual void stop() OVERRIDE; 68 virtual void stop() override;
69 69
70 OwnPtr<WebServiceWorkerRegistration> m_outerRegistration; 70 OwnPtr<WebServiceWorkerRegistration> m_outerRegistration;
71 WebServiceWorkerProvider* m_provider; 71 WebServiceWorkerProvider* m_provider;
72 RefPtrWillBeMember<ServiceWorker> m_installing; 72 RefPtrWillBeMember<ServiceWorker> m_installing;
73 RefPtrWillBeMember<ServiceWorker> m_waiting; 73 RefPtrWillBeMember<ServiceWorker> m_waiting;
74 RefPtrWillBeMember<ServiceWorker> m_active; 74 RefPtrWillBeMember<ServiceWorker> m_active;
75 75
76 bool m_stopped; 76 bool m_stopped;
77 }; 77 };
78 78
79 } // namespace blink 79 } // namespace blink
80 80
81 #endif // ServiceWorkerRegistration_h 81 #endif // ServiceWorkerRegistration_h
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/ServiceWorkerGlobalScope.h ('k') | Source/modules/serviceworkers/ServiceWorkerThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698