Oilpan: add transition types to Navigator and its supplements.

R=haraken@chromium.org
BUG=340522

Review URL: https://codereview.chromium.org/204063002

git-svn-id: svn://svn.chromium.org/blink/trunk@169529 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/Source/core/frame/DOMWindow.h

@@ -352,7 +352,7 @@ enum PageshowEventPersistence {
         mutable RefPtr<BarProp> m_statusbar;
         mutable RefPtr<BarProp> m_toolbar;
         mutable RefPtr<Console> m_console;
-        mutable RefPtr<Navigator> m_navigator;
+        mutable RefPtrWillBePersistent<Navigator> m_navigator;
         mutable RefPtr<Location> m_location;
         mutable RefPtr<StyleMedia> m_media;
 

third_party/WebKit/Source/core/frame/Navigator.cpp

@@ -129,4 +129,13 @@ void Navigator::getStorageUpdates()
     // FIXME: Remove this method or rename to yieldForStorageUpdates.
 }
 
+void Navigator::trace(Visitor* visitor)
+{
+    visitor->trace(m_plugins);
+    visitor->trace(m_mimeTypes);
+#if ENABLE(OILPAN)
+    HeapSupplementable<Navigator>::trace(visitor);
+#endif
+}
+
 } // namespace WebCore

third_party/WebKit/Source/core/frame/Navigator.h

@@ -39,9 +39,14 @@ class PluginData;
 
 typedef int ExceptionCode;
 
-class Navigator FINAL : public NavigatorBase, public ScriptWrappable, public RefCounted<Navigator>, public DOMWindowProperty, public Supplementable<Navigator> {
+class Navigator FINAL : public RefCountedWillBeGarbageCollectedFinalized<Navigator>, public NavigatorBase, public ScriptWrappable, public DOMWindowProperty, public WillBeHeapSupplementable<Navigator> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Navigator);
 public:
-    static PassRefPtr<Navigator> create(LocalFrame* frame) { return adoptRef(new Navigator(frame)); }
+    static PassRefPtrWillBeRawPtr<Navigator> create(LocalFrame* frame)
+    {
+        return adoptRefWillBeNoop(new Navigator(frame));
+    }
+
     virtual ~Navigator();
 
     AtomicString language() const;
@@ -59,11 +64,13 @@ public:
     // Relinquishes the storage lock, if one exists.
     void getStorageUpdates();
 
+    virtual void trace(Visitor*);
+
 private:
     explicit Navigator(LocalFrame*);
 
-    mutable RefPtrWillBePersistent<DOMPluginArray> m_plugins;
-    mutable RefPtrWillBePersistent<DOMMimeTypeArray> m_mimeTypes;
+    mutable RefPtrWillBeMember<DOMPluginArray> m_plugins;
+    mutable RefPtrWillBeMember<DOMMimeTypeArray> m_mimeTypes;
 };
 
 }

third_party/WebKit/Source/core/frame/Navigator.idl

@@ -17,7 +17,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-interface Navigator {
+[
+    WillBeGarbageCollected,
+] interface Navigator {
     readonly attribute DOMString language;
     readonly attribute PluginArray plugins;
     readonly attribute MimeTypeArray mimeTypes;

third_party/WebKit/Source/modules/battery/BatteryManager.cpp

@@ -12,9 +12,9 @@
 
 namespace WebCore {
 
-PassRefPtr<BatteryManager> BatteryManager::create(ExecutionContext* context)
+PassRefPtrWillBeRawPtr<BatteryManager> BatteryManager::create(ExecutionContext* context)
 {
-    return adoptRef(new BatteryManager(context));
+    return adoptRefWillBeRefCountedGarbageCollected(new BatteryManager(context));
 }
 
 BatteryManager::~BatteryManager()

third_party/WebKit/Source/modules/battery/BatteryManager.h

@@ -8,17 +8,18 @@
 #include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/Document.h"
 #include "core/events/EventTarget.h"
+#include "heap/Handle.h"
 #include "modules/battery/BatteryStatus.h"
 
 namespace WebCore {
 
 class Navigator;
 
-class BatteryManager FINAL : public ContextLifecycleObserver, public RefCounted<BatteryManager>, public EventTargetWithInlineData {
-    REFCOUNTED_EVENT_TARGET(BatteryManager);
+class BatteryManager FINAL : public RefCountedWillBeRefCountedGarbageCollected<BatteryManager>, public ContextLifecycleObserver, public EventTargetWithInlineData {
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<BatteryManager>);
 public:
     virtual ~BatteryManager();
-    static PassRefPtr<BatteryManager> create(ExecutionContext*);
+    static PassRefPtrWillBeRawPtr<BatteryManager> create(ExecutionContext*);
 
     // EventTarget implementation.
     virtual const WTF::AtomicString& interfaceName() const OVERRIDE { return EventTargetNames::BatteryManager; }
@@ -36,6 +37,8 @@ public:
 
     void didChangeBatteryStatus(PassRefPtr<Event>, PassOwnPtr<BatteryStatus>);
 
+    void trace(Visitor*) { }
+
 private:
     explicit BatteryManager(ExecutionContext*);
 

third_party/WebKit/Source/modules/battery/NavigatorBattery.cpp

@@ -37,12 +37,17 @@ const char* NavigatorBattery::supplementName()
 
 NavigatorBattery& NavigatorBattery::from(Navigator& navigator)
 {
-    NavigatorBattery* supplement = static_cast<NavigatorBattery*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorBattery* supplement = static_cast<NavigatorBattery*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorBattery();
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
+void NavigatorBattery::trace(Visitor* visitor)
+{
+    visitor->trace(m_batteryManager);
+}
+
 } // namespace WebCore

third_party/WebKit/Source/modules/battery/NavigatorBattery.h

@@ -6,6 +6,7 @@
 #define NavigatorBattery_h
 
 #include "core/frame/Navigator.h"
+#include "heap/Handle.h"
 #include "platform/Supplementable.h"
 
 namespace WebCore {
@@ -13,7 +14,8 @@ namespace WebCore {
 class BatteryManager;
 class Navigator;
 
-class NavigatorBattery : public Supplement<Navigator> {
+class NavigatorBattery FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorBattery>, public WillBeHeapSupplement<Navigator> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorBattery);
 public:
     virtual ~NavigatorBattery();
 
@@ -22,11 +24,13 @@ public:
     static BatteryManager* battery(Navigator&);
     BatteryManager* batteryManager(Navigator&);
 
+    void trace(Visitor*);
+
 private:
     NavigatorBattery();
     static const char* supplementName();
 
-    RefPtr<BatteryManager> m_batteryManager;
+    RefPtrWillBeMember<BatteryManager> m_batteryManager;
 };
 
 } // namespace WebCore

third_party/WebKit/Source/modules/donottrack/NavigatorDoNotTrack.cpp

@@ -53,10 +53,10 @@ const char* NavigatorDoNotTrack::supplementName()
 
 NavigatorDoNotTrack& NavigatorDoNotTrack::from(Navigator& navigator)
 {
-    NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorDoNotTrack* supplement = static_cast<NavigatorDoNotTrack*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorDoNotTrack(navigator.frame());
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }

third_party/WebKit/Source/modules/donottrack/NavigatorDoNotTrack.h

@@ -32,6 +32,7 @@
 #define NavigatorDoNotTrack_h
 
 #include "core/frame/DOMWindowProperty.h"
+#include "heap/Handle.h"
 #include "platform/Supplementable.h"
 #include "wtf/text/WTFString.h"
 
@@ -40,7 +41,8 @@ namespace WebCore {
 class LocalFrame;
 class Navigator;
 
-class NavigatorDoNotTrack FINAL : public Supplement<Navigator>, public DOMWindowProperty {
+class NavigatorDoNotTrack FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorDoNotTrack>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorDoNotTrack);
 public:
     virtual ~NavigatorDoNotTrack();
     static NavigatorDoNotTrack& from(Navigator&);
@@ -49,6 +51,8 @@ public:
 
     String doNotTrack();
 
+    void trace(Visitor*) { }
+
 private:
     explicit NavigatorDoNotTrack(LocalFrame*);
     static const char* supplementName();

third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.cpp

@@ -82,10 +82,10 @@ const char* NavigatorGamepad::supplementName()
 
 NavigatorGamepad& NavigatorGamepad::from(Navigator& navigator)
 {
-    NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorGamepad* supplement = static_cast<NavigatorGamepad*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorGamepad();
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
@@ -116,4 +116,10 @@ GamepadList* NavigatorGamepad::gamepads()
     return m_gamepads.get();
 }
 
+void NavigatorGamepad::trace(Visitor* visitor)
+{
+    visitor->trace(m_gamepads);
+    visitor->trace(m_webkitGamepads);
+}
+
 } // namespace WebCore

third_party/WebKit/Source/modules/gamepad/NavigatorGamepad.h

@@ -36,7 +36,8 @@ class GamepadList;
 class Navigator;
 class WebKitGamepadList;
 
-class NavigatorGamepad FINAL : public Supplement<Navigator> {
+class NavigatorGamepad FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorGamepad>, public WillBeHeapSupplement<Navigator> {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorGamepad);
 public:
     virtual ~NavigatorGamepad();
     static NavigatorGamepad& from(Navigator&);
@@ -47,12 +48,14 @@ public:
     WebKitGamepadList* webkitGamepads();
     GamepadList* gamepads();
 
+    virtual void trace(Visitor*);
+
 private:
     NavigatorGamepad();
     static const char* supplementName();
 
-    RefPtrWillBePersistent<GamepadList> m_gamepads;
-    RefPtrWillBePersistent<WebKitGamepadList> m_webkitGamepads;
+    RefPtrWillBeMember<GamepadList> m_gamepads;
+    RefPtrWillBeMember<WebKitGamepadList> m_webkitGamepads;
 };
 
 } // namespace WebCore

third_party/WebKit/Source/modules/geolocation/NavigatorGeolocation.cpp

@@ -46,10 +46,10 @@ const char* NavigatorGeolocation::supplementName()
 
 NavigatorGeolocation& NavigatorGeolocation::from(Navigator& navigator)
 {
-    NavigatorGeolocation* supplement = static_cast<NavigatorGeolocation*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorGeolocation* supplement = static_cast<NavigatorGeolocation*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorGeolocation(navigator.frame());
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
@@ -66,4 +66,9 @@ Geolocation* NavigatorGeolocation::geolocation() const
     return m_geolocation.get();
 }
 
+void NavigatorGeolocation::trace(Visitor* visitor)
+{
+    visitor->trace(m_geolocation);
+}
+
 } // namespace WebCore

third_party/WebKit/Source/modules/geolocation/NavigatorGeolocation.h

@@ -30,7 +30,8 @@ class LocalFrame;
 class Geolocation;
 class Navigator;
 
-class NavigatorGeolocation FINAL : public Supplement<Navigator>, public DOMWindowProperty {
+class NavigatorGeolocation FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorGeolocation>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorGeolocation);
 public:
     virtual ~NavigatorGeolocation();
     static NavigatorGeolocation& from(Navigator&);
@@ -38,11 +39,13 @@ public:
     static Geolocation* geolocation(Navigator&);
     Geolocation* geolocation() const;
 
+    void trace(Visitor*);
+
 private:
     NavigatorGeolocation(LocalFrame*);
     static const char* supplementName();
 
-    mutable RefPtrWillBePersistent<Geolocation> m_geolocation;
+    mutable RefPtrWillBeMember<Geolocation> m_geolocation;
 };
 
 } // namespace WebCore

third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.cpp

@@ -53,10 +53,10 @@ const char* NavigatorStorageQuota::supplementName()
 
 NavigatorStorageQuota& NavigatorStorageQuota::from(Navigator& navigator)
 {
-    NavigatorStorageQuota* supplement = static_cast<NavigatorStorageQuota*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorStorageQuota* supplement = static_cast<NavigatorStorageQuota*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorStorageQuota(navigator.frame());
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
@@ -97,4 +97,11 @@ DeprecatedStorageQuota* NavigatorStorageQuota::webkitPersistentStorage() const
     return m_persistentStorage.get();
 }
 
+void NavigatorStorageQuota::trace(Visitor* visitor)
+{
+    visitor->trace(m_storageQuota);
+    visitor->trace(m_temporaryStorage);
+    visitor->trace(m_persistentStorage);
+}
+
 } // namespace WebCore

third_party/WebKit/Source/modules/quota/NavigatorStorageQuota.h

@@ -42,7 +42,8 @@ class LocalFrame;
 class Navigator;
 class StorageQuota;
 
-class NavigatorStorageQuota FINAL : public Supplement<Navigator>, public DOMWindowProperty {
+class NavigatorStorageQuota FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorStorageQuota>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorStorageQuota);
 public:
     virtual ~NavigatorStorageQuota();
     static NavigatorStorageQuota& from(Navigator&);
@@ -55,13 +56,15 @@ public:
     DeprecatedStorageQuota* webkitTemporaryStorage() const;
     DeprecatedStorageQuota* webkitPersistentStorage() const;
 
+    void trace(Visitor*);
+
 private:
     explicit NavigatorStorageQuota(LocalFrame*);
     static const char* supplementName();
 
-    mutable RefPtrWillBePersistent<StorageQuota> m_storageQuota;
-    mutable RefPtrWillBePersistent<DeprecatedStorageQuota> m_temporaryStorage;
-    mutable RefPtrWillBePersistent<DeprecatedStorageQuota> m_persistentStorage;
+    mutable RefPtrWillBeMember<StorageQuota> m_storageQuota;
+    mutable RefPtrWillBeMember<DeprecatedStorageQuota> m_temporaryStorage;
+    mutable RefPtrWillBeMember<DeprecatedStorageQuota> m_persistentStorage;
 };
 
 } // namespace WebCore

third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.cpp

@@ -24,11 +24,16 @@ NavigatorServiceWorker& NavigatorServiceWorker::from(Navigator& navigator)
     NavigatorServiceWorker* supplement = toNavigatorServiceWorker(navigator);
     if (!supplement) {
         supplement = new NavigatorServiceWorker(navigator);
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }
 
+NavigatorServiceWorker* NavigatorServiceWorker::toNavigatorServiceWorker(Navigator& navigator)
+{
+    return static_cast<NavigatorServiceWorker*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
+}
+
 const char* NavigatorServiceWorker::supplementName()
 {
     return "NavigatorServiceWorker";

third_party/WebKit/Source/modules/serviceworkers/NavigatorServiceWorker.h

@@ -7,6 +7,7 @@
 
 #include "bindings/v8/ScriptPromise.h"
 #include "core/frame/Navigator.h"
+#include "heap/Handle.h"
 #include "platform/Supplementable.h"
 
 namespace WebCore {
@@ -14,15 +15,18 @@ namespace WebCore {
 class Navigator;
 class ServiceWorkerContainer;
 
-class NavigatorServiceWorker FINAL : public Supplement<Navigator>, DOMWindowProperty {
+class NavigatorServiceWorker FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorServiceWorker>, public WillBeHeapSupplement<Navigator>, DOMWindowProperty {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorServiceWorker);
 public:
     virtual ~NavigatorServiceWorker();
     static NavigatorServiceWorker& from(Navigator&);
-    static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator& navigator) { return static_cast<NavigatorServiceWorker*>(Supplement<Navigator>::from(navigator, supplementName())); }
+    static NavigatorServiceWorker* toNavigatorServiceWorker(Navigator&);
     static const char* supplementName();
 
     static ServiceWorkerContainer* serviceWorker(ExecutionContext*, Navigator&);
 
+    void trace(Visitor*) { }
+
 private:
     explicit NavigatorServiceWorker(Navigator&);
     ServiceWorkerContainer* serviceWorker(ExecutionContext*);

third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.cpp

@@ -55,10 +55,10 @@ const char* NavigatorWebMIDI::supplementName()
 
 NavigatorWebMIDI& NavigatorWebMIDI::from(Navigator& navigator)
 {
-    NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorWebMIDI* supplement = static_cast<NavigatorWebMIDI*>(WillBeHeapSupplement<Navigator>::from(navigator, supplementName()));
     if (!supplement) {
         supplement = new NavigatorWebMIDI(navigator.frame());
-        provideTo(navigator, supplementName(), adoptPtr(supplement));
+        provideTo(navigator, supplementName(), adoptPtrWillBeNoop(supplement));
     }
     return *supplement;
 }

third_party/WebKit/Source/modules/webmidi/NavigatorWebMIDI.h

@@ -32,6 +32,7 @@
 #define NavigatorWebMIDI_h
 
 #include "core/frame/DOMWindowProperty.h"
+#include "heap/Handle.h"
 #include "modules/webmidi/MIDIOptions.h"
 #include "platform/Supplementable.h"
 
@@ -40,7 +41,8 @@ namespace WebCore {
 class MIDIAccessPromise;
 class Navigator;
 
-class NavigatorWebMIDI FINAL : public Supplement<Navigator>, public DOMWindowProperty {
+class NavigatorWebMIDI FINAL : public NoBaseWillBeGarbageCollectedFinalized<NavigatorWebMIDI>, public WillBeHeapSupplement<Navigator>, public DOMWindowProperty {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(NavigatorWebMIDI);
 public:
     virtual ~NavigatorWebMIDI();
     static NavigatorWebMIDI& from(Navigator&);
@@ -48,6 +50,8 @@ public:
     static PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(Navigator&, const Dictionary&);
     PassRefPtrWillBeRawPtr<MIDIAccessPromise> requestMIDIAccess(const Dictionary&);
 
+    void trace(Visitor*) { }
+
 private:
     NavigatorWebMIDI(LocalFrame*);
     static const char* supplementName();