Changeset 166406 in webkit

Timestamp:

Mar 28, 2014 8:34:03 AM (10 years ago)

Author:

mario.prada@samsung.com

Message:

[GTK] Geoclue2 providers won't work after reloading
​https://bugs.webkit.org/show_bug.cgi?id=130898

Reviewed by Martin Robinson.

Don't reuse the Geoclue2 client proxy between different calls to
startPosition(), and create a new client proxy each time instead.

• platform/geoclue/GeolocationProviderGeoclue2.cpp:

(GeolocationProviderGeoclue::startUpdating): Don't reuse the
client proxy, by always calling geoclue_manager_call_get_client().
(GeolocationProviderGeoclue::stopUpdating): Disconnect from the
'location-updated' signal and dispose the client proxy.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/geoclue/GeolocationProviderGeoclue2.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-28  Mario Sanchez Prada  <mario.prada@samsung.com>
+
+        [GTK] Geoclue2 providers won't work after reloading
+        https://bugs.webkit.org/show_bug.cgi?id=130898
+
+        Reviewed by Martin Robinson.
+
+        Don't reuse the Geoclue2 client proxy between different calls to
+        startPosition(), and create a new client proxy each time instead.
+
+        * platform/geoclue/GeolocationProviderGeoclue2.cpp:
+        (GeolocationProviderGeoclue::startUpdating): Don't reuse the
+        client proxy, by always calling geoclue_manager_call_get_client().
+        (GeolocationProviderGeoclue::stopUpdating): Disconnect from the
+        'location-updated' signal and dispose the client proxy.
+
 2014-03-28  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Source/WebCore/platform/geoclue/GeolocationProviderGeoclue2.cpp

@@ -74 +74 @@
     }
 
-    if (!m_clientProxy) {
-        geoclue_manager_call_get_client(m_managerProxy.get(), nullptr, reinterpret_cast<GAsyncReadyCallback>(getGeoclueClientCallback), this);
-        return;
-    }
-
-    startGeoclueClient();
+    geoclue_manager_call_get_client(m_managerProxy.get(), nullptr, reinterpret_cast<GAsyncReadyCallback>(getGeoclueClientCallback), this);
 }
 
 void GeolocationProviderGeoclue::stopUpdating()
 {
-    if (m_clientProxy)
+    if (m_clientProxy) {
         geoclue_client_call_stop(m_clientProxy.get(), nullptr, nullptr, nullptr);
+        g_signal_handlers_disconnect_by_func(m_clientProxy.get(), reinterpret_cast<gpointer>(locationUpdatedCallback), this);
+        m_clientProxy = nullptr;
+    }
     m_isUpdating = false;
 }