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

Unified Diff: Source/modules/serviceworkers/NavigatorServiceWorker.h

Issue 1101263003: Oilpan: have Navigator and its supplements be on the heap by default. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Make NavigatorBeacon a frame observer instead Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/serviceworkers/NavigatorServiceWorker.h
diff --git a/Source/modules/serviceworkers/NavigatorServiceWorker.h b/Source/modules/serviceworkers/NavigatorServiceWorker.h
index 0c5623caee31ad57e6954ffaa3f3aacdd3a87a8a..2a51f0afc65cf4e187757491c17279c1adb39bcb 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>, 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

Powered by Google App Engine
This is Rietveld 408576698