Index: Source/modules/serviceworkers/NavigatorServiceWorker.h |
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.h b/Source/modules/serviceworkers/NavigatorServiceWorker.h |
index 0c5623caee31ad57e6954ffaa3f3aacdd3a87a8a..dfe55f946e4578e12773917516916039052cea0a 100644 |
--- a/Source/modules/serviceworkers/NavigatorServiceWorker.h |
+++ b/Source/modules/serviceworkers/NavigatorServiceWorker.h |
@@ -16,14 +16,14 @@ class Document; |
class Navigator; |
class ServiceWorkerContainer; |
-class MODULES_EXPORT NavigatorServiceWorker final : public NoBaseWillBeGarbageCollected<NavigatorServiceWorker>, public WillBeHeapSupplement<Navigator>, DOMWindowProperty { |
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker); |
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorServiceWorker); |
+class MODULES_EXPORT NavigatorServiceWorker final : public GarbageCollectedFinalized<NavigatorServiceWorker>, public HeapSupplement<Navigator>, public DOMWindowProperty { |
+ USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker); |
public: |
static NavigatorServiceWorker* from(Document&); |
static NavigatorServiceWorker& from(Navigator&); |
static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&); |
- static const char* supplementName(); |
+ |
+ virtual ~NavigatorServiceWorker(); |
static ServiceWorkerContainer* serviceWorker(Navigator&); |
@@ -33,10 +33,12 @@ private: |
explicit NavigatorServiceWorker(Navigator&); |
ServiceWorkerContainer* serviceWorker(); |
+ static const char* supplementName(); |
+ |
// DOMWindowProperty override. |
virtual void willDetachGlobalObjectFromFrame() override; |
- PersistentWillBeMember<ServiceWorkerContainer> m_serviceWorker; |
+ Member<ServiceWorkerContainer> m_serviceWorker; |
}; |
} // namespace blink |