Changeset 54079 in webkit

Timestamp:

Jan 29, 2010 2:08:05 PM (14 years ago)

Author:

sfalken@apple.com

Message:

2010-01-29 Steve Falkenburg <​sfalken@apple.com>

Reviewed by Darin Adler.

Client-based Geolocation starts updating before getting consent from the user
​https://bugs.webkit.org/show_bug.cgi?id=34343

• page/Geolocation.cpp: (WebCore::Geolocation::startRequest): Pass notifier instead of options to startUpdating. (WebCore::Geolocation::setIsAllowed): Add the observer or notify of error for deferred startUpdating. (WebCore::Geolocation::startUpdating): Pass notifier instead of options, since we may need to call it if we fail to get user consent. Defer adding the observer if we don't yet have user consent, since this could kick off server-based wifi Geolocation requests.
• page/Geolocation.h:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Geolocation.cpp (modified) (4 diffs)
• page/Geolocation.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Steve Falkenburg  <sfalken@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Client-based Geolocation starts updating before getting consent from the user
+        https://bugs.webkit.org/show_bug.cgi?id=34343
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::startRequest): Pass notifier instead of options to startUpdating.
+        (WebCore::Geolocation::setIsAllowed): Add the observer or notify of error for deferred startUpdating.
+        (WebCore::Geolocation::startUpdating): Pass notifier instead of options, since we may need to call it if we fail to get user consent.
+        Defer adding the observer if we don't yet have user consent, since this could kick off
+        server-based wifi Geolocation requests.
+        * page/Geolocation.h:
+
 2010-01-28  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/page/Geolocation.cpp

@@ -246 +246 @@
         notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
     else {
-        if (notifier->hasZeroTimeout() || startUpdating(notifier->m_options.get()))
+        if (notifier->hasZeroTimeout() || startUpdating(notifier.get()))
             notifier->startTimerIfNeeded();
         else
@@ -301 +301 @@
 {
     m_allowGeolocation = allowed ? Yes : No;
+    
+#if ENABLE(CLIENT_BASED_GEOLOCATION)
+    if (m_startRequestPermissionNotifier) {
+        if (isAllowed()) {
+            // Permission request was made during the startUpdating process
+            m_startRequestPermissionNotifier = 0;
+            if (!m_frame)
+                return;
+            Page* page = m_frame->page();
+            if (!page)
+                return;
+            page->geolocationController()->addObserver(this);
+        } else {
+            m_startRequestPermissionNotifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
+            m_oneShots.add(m_startRequestPermissionNotifier);
+            m_startRequestPermissionNotifier = 0;
+        }
+        return;
+    }
+#endif
     
     if (isAllowed())
@@ -480 +500 @@
 #endif
 
-bool Geolocation::startUpdating(PositionOptions* options)
+bool Geolocation::startUpdating(GeoNotifier* notifier)
 {
 #if ENABLE(CLIENT_BASED_GEOLOCATION)
     // FIXME: Pass options to client.
-    UNUSED_PARAM(options);
-
+
+    if (!isAllowed()) {
+        m_startRequestPermissionNotifier = notifier;
+        requestPermission();
+        return true;
+    }
+    
     if (!m_frame)
         return false;
@@ -496 +521 @@
     return true;
 #else
-    return m_service->startUpdating(options);
+    return m_service->startUpdating(notifier->options);
 #endif
 }

trunk/WebCore/page/Geolocation.h

@@ -139 +139 @@
     void requestPermission();
 
-    bool startUpdating(PositionOptions*);
+    bool startUpdating(GeoNotifier*);
     void stopUpdating();
 
@@ -160 +160 @@
 #if !ENABLE(CLIENT_BASED_GEOLOCATION)
     OwnPtr<GeolocationService> m_service;
+#else
+    RefPtr<GeoNotifier> m_startRequestPermissionNotifier;
 #endif
     RefPtr<Geoposition> m_lastPosition;