Oilpan: detach GeolocationController on being destroyed as a supplement.

Source/modules/geolocation/GeolocationController.cpp

 /*
  * 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 65 matching lines @@
 {
     if (!m_isClientUpdating)
         return;
     m_isClientUpdating = false;
     m_client->stopUpdating();
 }
 
 GeolocationController::~GeolocationController()
 {
     ASSERT(m_observers.isEmpty());
-    if (page())
+    detach();
+}
+
+void GeolocationController::detach()
+{
+    if (page() && m_inspectorAgent) {
         m_inspectorAgent->RemoveController(this);

[haraken, 2014/06/21 02:19:53]

keishi@: I think you need to remove this code when moving the InspectorAgent to
the heap. I think you can remove the code by making
GeolocationInspectorAgent::m_controllers a hash set of weak members.

+        m_inspectorAgent = 0;
+    }
 
-    if (m_hasClientForTest)
+    if (m_hasClientForTest) {
         m_client->controllerForTestRemoved(this);
+        m_hasClientForTest = false;
+    }
 }
 
 // FIXME: Oilpan: Once GeolocationClient is on-heap m_client should be a strong

[haraken, 2014/06/21 02:19:53]

We might want to consider moving GeolocationClient to the heap. Once the
GeolocationInspectorAgent and the GeolocationClient are moved to the heap, we
can make the destructor empty.

 // pointer and |willBeDestroyed| can potentially be removed from Supplement.
 void GeolocationController::willBeDestroyed()
 {
-    if (m_client)
+    detach();
+    if (m_client) {
         m_client->geolocationDestroyed();
+        m_client = 0;
+    }
 }
 
 void GeolocationController::persistentHostHasBeenDestroyed()
 {
     observeContext(0);
 }
 
 PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
 {
     return adoptPtrWillBeNoop(new GeolocationController(frame, client));
@@ skipping 110 matching lines @@
     visitor->trace(m_highAccuracyObservers);
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
 void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client)
 {
     WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
 }
 
 } // namespace WebCore