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

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

Issue 874003002: Oilpan: dispose ServiceWorker (and registration) objects earlier. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 11 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"
(...skipping 13 matching lines...) Expand all
24 class WebServiceWorkerProvider; 24 class WebServiceWorkerProvider;
25 25
26 class ServiceWorkerRegistration final 26 class ServiceWorkerRegistration final
27 : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerRe gistration> 27 : public RefCountedGarbageCollectedEventTargetWithInlineData<ServiceWorkerRe gistration>
28 , public ActiveDOMObject 28 , public ActiveDOMObject
29 , public WebServiceWorkerRegistrationProxy 29 , public WebServiceWorkerRegistrationProxy
30 , public HeapSupplementable<ServiceWorkerRegistration> { 30 , public HeapSupplementable<ServiceWorkerRegistration> {
31 DEFINE_WRAPPERTYPEINFO(); 31 DEFINE_WRAPPERTYPEINFO();
32 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S erviceWorkerRegistration>); 32 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<S erviceWorkerRegistration>);
33 USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration); 33 USING_GARBAGE_COLLECTED_MIXIN(ServiceWorkerRegistration);
34 WILL_BE_USING_PRE_FINALIZER(ServiceWorkerRegistration, dispose);
haraken 2015/01/26 01:39:42 Can we drop WILL_BE_, since ServiceWorkerRegistrat
sof 2015/01/26 06:21:41 But it doesn't use lazy sweeping?
haraken 2015/01/26 06:29:03 Conceptually, whether we should enable lazy sweepi
34 public: 35 public:
35 // EventTarget overrides. 36 // EventTarget overrides.
36 virtual const AtomicString& interfaceName() const override; 37 virtual const AtomicString& interfaceName() const override;
37 virtual ExecutionContext* executionContext() const override { return ActiveD OMObject::executionContext(); } 38 virtual ExecutionContext* executionContext() const override { return ActiveD OMObject::executionContext(); }
38 39
39 // WebServiceWorkerRegistrationProxy overrides. 40 // WebServiceWorkerRegistrationProxy overrides.
40 virtual void dispatchUpdateFoundEvent() override; 41 virtual void dispatchUpdateFoundEvent() override;
41 virtual void setInstalling(WebServiceWorker*) override; 42 virtual void setInstalling(WebServiceWorker*) override;
42 virtual void setWaiting(WebServiceWorker*) override; 43 virtual void setWaiting(WebServiceWorker*) override;
43 virtual void setActive(WebServiceWorker*) override; 44 virtual void setActive(WebServiceWorker*) override;
(...skipping 19 matching lines...) Expand all
63 virtual void trace(Visitor*) override; 64 virtual void trace(Visitor*) override;
64 65
65 private: 66 private:
66 static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceW orkerRegistration*); 67 static ServiceWorkerRegistration* getOrCreate(ExecutionContext*, WebServiceW orkerRegistration*);
67 ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegi stration>); 68 ServiceWorkerRegistration(ExecutionContext*, PassOwnPtr<WebServiceWorkerRegi stration>);
68 69
69 // ActiveDOMObject overrides. 70 // ActiveDOMObject overrides.
70 virtual bool hasPendingActivity() const override; 71 virtual bool hasPendingActivity() const override;
71 virtual void stop() override; 72 virtual void stop() override;
72 73
74 void dispose();
75
73 OwnPtr<WebServiceWorkerRegistration> m_outerRegistration; 76 OwnPtr<WebServiceWorkerRegistration> m_outerRegistration;
74 WebServiceWorkerProvider* m_provider; 77 WebServiceWorkerProvider* m_provider;
75 RefPtrWillBeMember<ServiceWorker> m_installing; 78 RefPtrWillBeMember<ServiceWorker> m_installing;
76 RefPtrWillBeMember<ServiceWorker> m_waiting; 79 RefPtrWillBeMember<ServiceWorker> m_waiting;
77 RefPtrWillBeMember<ServiceWorker> m_active; 80 RefPtrWillBeMember<ServiceWorker> m_active;
78 81
79 bool m_stopped; 82 bool m_stopped;
80 }; 83 };
81 84
82 } // namespace blink 85 } // namespace blink
83 86
84 #endif // ServiceWorkerRegistration_h 87 #endif // ServiceWorkerRegistration_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698