Get the WebGeolocationClient from WebFrameClient instead of WebViewClient.

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 10 matching lines @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "modules/geolocation/GeolocationController.h"
 
 #include "core/inspector/InspectorController.h"
+#include "core/page/Page.h"
 #include "modules/geolocation/GeolocationClient.h"
 #include "modules/geolocation/GeolocationError.h"
 #include "modules/geolocation/GeolocationInspectorAgent.h"
 #include "modules/geolocation/GeolocationPosition.h"
 
 namespace WebCore {
 
-GeolocationController::GeolocationController(Page& page, GeolocationClient* client)
-    : PageLifecycleObserver(&page)
+GeolocationController::GeolocationController(LocalFrame& frame, GeolocationClient* client)
+    : PageLifecycleObserver(frame.page())
     , m_client(client)
     , m_hasClientForTest(false)
     , m_isClientUpdating(false)
     , m_inspectorAgent()
 {
-    OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorAgent::create(this));
-    m_inspectorAgent = geolocationAgent.get();
-    page.inspectorController().registerModuleAgent(geolocationAgent.release());
+    // FIXME: Once GeolocationInspectorAgent is per frame, there will be a 1:1 relationship between
+    // it and this class. Until then, there's one GeolocationInspectorAgent per page that the main
+    // frame is responsible for creating.
+    if (frame.isMainFrame()) {
+        OwnPtr<GeolocationInspectorAgent> geolocationAgent(GeolocationInspectorAgent::create());
+        m_inspectorAgent = geolocationAgent.get();
+        frame.page()->inspectorController().registerModuleAgent(geolocationAgent.release());
+    } else {
+        m_inspectorAgent = GeolocationController::from(frame.page()->mainFrame())->m_inspectorAgent;
+    }
+
+    m_inspectorAgent->AddController(this);
+
+    if (!frame.isMainFrame()) {
+        // internals.setGeolocationClientMock is per page.
+        GeolocationController* mainController = GeolocationController::from(frame.page()->mainFrame());
+        if (mainController->hasClientForTest())
+            setClientForTest(mainController->client());
+    }
 }
 
 void GeolocationController::startUpdatingIfNeeded()
 {
     if (m_isClientUpdating)
         return;
     m_isClientUpdating = true;
     m_client->startUpdating();
 }
 
 void GeolocationController::stopUpdatingIfNeeded()
 {
     if (!m_isClientUpdating)
         return;
     m_isClientUpdating = false;
     m_client->stopUpdating();
 }
 
 GeolocationController::~GeolocationController()
 {
     ASSERT(m_observers.isEmpty());
+    if (page())
+        m_inspectorAgent->RemoveController(this);
+
+    if (m_hasClientForTest)
+        m_client->controllerForTestRemoved(this);
 }
 
 void GeolocationController::willBeDestroyed()
 {
     if (m_client)
         m_client->geolocationDestroyed();
 }
 
-PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(Page& page, GeolocationClient* client)
+PassOwnPtrWillBeRawPtr<GeolocationController> GeolocationController::create(LocalFrame& frame, GeolocationClient* client)
 {
-    return adoptPtrWillBeNoop(new GeolocationController(page, client));
+    return adoptPtrWillBeNoop(new GeolocationController(frame, client));
 }
 
 void GeolocationController::addObserver(Geolocation* observer, bool enableHighAccuracy)
 {
     // This may be called multiple times with the same observer, though removeObserver()
     // is called only once with each.
     bool wasEmpty = m_observers.isEmpty();
     m_observers.add(observer);
     if (enableHighAccuracy)
         m_highAccuracyObservers.add(observer);
@@ skipping 64 matching lines @@
     if (!m_client)
         return 0;
 
     return m_client->lastPosition();
 }
 
 void GeolocationController::setClientForTest(GeolocationClient* client)
 {
     m_client = client;
     m_hasClientForTest = true;
+
+    client->controllerForTestAdded(this);
 }
 
 void GeolocationController::pageVisibilityChanged()
 {
     if (m_observers.isEmpty() || !m_client)
         return;
 
     if (page() && page()->visibilityState() == PageVisibilityStateVisible)
         startUpdatingIfNeeded();
     else
         stopUpdatingIfNeeded();
 }
 
 const char* GeolocationController::supplementName()
 {
     return "GeolocationController";
 }
 
 void GeolocationController::trace(Visitor* visitor)
 {
     visitor->trace(m_lastPosition);
     visitor->trace(m_observers);
     visitor->trace(m_highAccuracyObservers);
-    WillBeHeapSupplement<Page>::trace(visitor);
+    WillBeHeapSupplement<LocalFrame>::trace(visitor);
 }
 
-void provideGeolocationTo(Page& page, GeolocationClient* client)
+void provideGeolocationTo(LocalFrame& frame, GeolocationClient* client)
 {
-    WillBeHeapSupplement<Page>::provideTo(page, GeolocationController::supplementName(), GeolocationController::create(page, client));
+    WillBeHeapSupplement<LocalFrame>::provideTo(frame, GeolocationController::supplementName(), GeolocationController::create(frame, client));
 }
 
 } // namespace WebCore