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

Unified Diff: Source/modules/credentialmanager/NavigatorCredentials.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/credentialmanager/NavigatorCredentials.h
diff --git a/Source/modules/credentialmanager/NavigatorCredentials.h b/Source/modules/credentialmanager/NavigatorCredentials.h
index 60b2f998caf44e9e8cc70ad37c150b7dfce73f45..a0177d9e030f1d55aed530cc9bb57f072976e424 100644
--- a/Source/modules/credentialmanager/NavigatorCredentials.h
+++ b/Source/modules/credentialmanager/NavigatorCredentials.h
@@ -15,12 +15,12 @@ namespace blink {
class CredentialsContainer;
class Navigator;
-class NavigatorCredentials final : public NoBaseWillBeGarbageCollected<NavigatorCredentials>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorCredentials);
- DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(NavigatorCredentials);
+// TODO(Oilpan): when ~DOMWindowProperty is removed, derive from GarbageCollected<> instead.
+class NavigatorCredentials final : public GarbageCollectedFinalized<NavigatorCredentials>, public HeapSupplement<Navigator>, DOMWindowProperty {
+ USING_GARBAGE_COLLECTED_MIXIN(NavigatorCredentials);
public:
static NavigatorCredentials& from(Navigator&);
- static const char* supplementName();
+ virtual ~NavigatorCredentials();
// NavigatorCredentials.idl
static CredentialsContainer* credentials(Navigator&);
@@ -31,7 +31,9 @@ private:
explicit NavigatorCredentials(Navigator&);
CredentialsContainer* credentials();
- PersistentWillBeMember<CredentialsContainer> m_credentialsContainer;
+ static const char* supplementName();
+
+ Member<CredentialsContainer> m_credentialsContainer;
};
} // namespace blink

Powered by Google App Engine
This is Rietveld 408576698