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

Unified Diff: Source/modules/plugins/NavigatorPlugins.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: rebased 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/plugins/NavigatorPlugins.h
diff --git a/Source/modules/plugins/NavigatorPlugins.h b/Source/modules/plugins/NavigatorPlugins.h
index c2a99f78d1cf7c187ea25d5184ead3544cb43725..6f0de460216700dc62461d8f0e1bcc7fe66be7bb 100644
--- a/Source/modules/plugins/NavigatorPlugins.h
+++ b/Source/modules/plugins/NavigatorPlugins.h
@@ -15,16 +15,14 @@ class DOMPluginArray;
class LocalFrame;
class Navigator;
-class NavigatorPlugins final
- : public NoBaseWillBeGarbageCollected<NavigatorPlugins>
- , public WillBeHeapSupplement<Navigator>
- , DOMWindowProperty {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorPlugins);
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorPlugins);
+// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead.
+class NavigatorPlugins final : public GarbageCollectedFinalized<NavigatorPlugins>, public HeapSupplement<Navigator>, DOMWindowProperty {
+ USING_GARBAGE_COLLECTED_MIXIN(NavigatorPlugins);
public:
static NavigatorPlugins& from(Navigator&);
static NavigatorPlugins* toNavigatorPlugins(Navigator&);
- static const char* supplementName();
+
+ virtual ~NavigatorPlugins();
static DOMPluginArray* plugins(Navigator&);
static DOMMimeTypeArray* mimeTypes(Navigator&);
@@ -35,6 +33,8 @@ public:
private:
explicit NavigatorPlugins(Navigator&);
+ static const char* supplementName();
+
DOMPluginArray* plugins(LocalFrame*) const;
DOMMimeTypeArray* mimeTypes(LocalFrame*) const;
bool javaEnabled(LocalFrame*) const;

Powered by Google App Engine
This is Rietveld 408576698