Oilpan: Move GeolocationController back to off-heap

Source/modules/geolocation/GeolocationController.h

 /*
  * Copyright (C) 2009 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 23 matching lines @@
 #include "wtf/Noncopyable.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 class GeolocationInspectorAgent;
 class GeolocationClient;
 class GeolocationError;
 class GeolocationPosition;
 
-class GeolocationController FINAL : public NoBaseWillBeGarbageCollectedFinalized<GeolocationController>, public WillBeHeapSupplement<LocalFrame>, public PageLifecycleObserver {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(GeolocationController);
+class GeolocationController FINAL : public Supplement<LocalFrame>, public PageLifecycleObserver {
     WTF_MAKE_NONCOPYABLE(GeolocationController);
 public:
     virtual ~GeolocationController();
 
     static PassOwnPtr<GeolocationController> create(LocalFrame&, GeolocationClient*);
 
     void addObserver(Geolocation*, bool enableHighAccuracy);
     void removeObserver(Geolocation*);

[haraken, 2014/06/04 01:03:19]

jam@, michael@: I found that no one is calling removeObserver(). Won't it leak
the Geolocation objects in the ObserverSet?

 
     void requestPermission(Geolocation*);
     void cancelPermissionRequest(Geolocation*);
 
     void positionChanged(GeolocationPosition*);
     void errorOccurred(GeolocationError*);
 
     GeolocationPosition* lastPosition();
 
     void setClientForTest(GeolocationClient*);
     bool hasClientForTest() { return m_hasClientForTest; }
     GeolocationClient* client() { return m_client; }
 
     // Inherited from PageLifecycleObserver.
     virtual void pageVisibilityChanged() OVERRIDE;
 
     static const char* supplementName();
-    static GeolocationController* from(LocalFrame* frame) { return static_cast<GeolocationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName())); }
-
-    virtual void trace(Visitor*) OVERRIDE;
+    static GeolocationController* from(LocalFrame* frame) { return static_cast<GeolocationController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
 
     virtual void willBeDestroyed() OVERRIDE;
 
 private:
     GeolocationController(LocalFrame&, GeolocationClient*);
 
     void startUpdatingIfNeeded();
     void stopUpdatingIfNeeded();
 
     GeolocationClient* m_client;
     bool m_hasClientForTest;
 
-    RefPtrWillBeMember<GeolocationPosition> m_lastPosition;
-    typedef WillBeHeapHashSet<RefPtrWillBeMember<Geolocation> > ObserversSet;
+    RefPtrWillBePersistent<GeolocationPosition> m_lastPosition;
+    typedef WillBePersistentHeapHashSet<RefPtrWillBeMember<Geolocation> > ObserversSet;
     // All observers; both those requesting high accuracy and those not.
     ObserversSet m_observers;
     ObserversSet m_highAccuracyObservers;
     bool m_isClientUpdating;
     GeolocationInspectorAgent* m_inspectorAgent;
 };
 
 } // namespace WebCore
 
 #endif // GeolocationController_h