Changeset 47152 in webkit

Timestamp:

Aug 12, 2009 3:08:55 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-08-12 Steve Block <​steveblock@google.com>

Reviewed by Eric Seidel.

Bug 26993 : Geolocation::requestPermission()
​https://bugs.webkit.org/show_bug.cgi?id=26993

Second patch to allow the Geolocation permission request to chrome to be asynchronous
or synchronous. Fixes a bug where callbacks were called twice when permissions
are granted synchronously.

No new tests required.

• page/Geolocation.cpp: (WebCore::Geolocation::setIsAllowed): Modified. Calls makeSuccessCallbacks() rather than geolocationServicePositionChanged(). (WebCore::Geolocation::geolocationServicePositionChanged): Modified. Updated logic to avoid repeated callbacks when permissions are granted synchronously. (WebCore::Geolocation::makeSuccessCallbacks): Added. Calls success callbacks.
• page/Geolocation.h: Modified. Adds makeSuccessCallbacks().

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-12  Steve Block  <steveblock@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Bug 26993 : Geolocation::requestPermission()
+        https://bugs.webkit.org/show_bug.cgi?id=26993
+
+        Second patch to allow the Geolocation permission request to chrome to be asynchronous
+        or synchronous. Fixes a bug where callbacks were called twice when permissions
+        are granted synchronously.
+
+        No new tests required.
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::setIsAllowed): Modified. Calls makeSuccessCallbacks() rather than geolocationServicePositionChanged().
+        (WebCore::Geolocation::geolocationServicePositionChanged): Modified. Updated logic to avoid repeated callbacks when permissions are granted synchronously.
+        (WebCore::Geolocation::makeSuccessCallbacks): Added. Calls success callbacks.
+        * page/Geolocation.h: Modified. Adds makeSuccessCallbacks().
+
 2009-08-12  Anders Carlsson  <andersca@apple.com>
 

trunk/WebCore/page/Geolocation.cpp

@@ -140 +140 @@
     if (isAllowed()) {
         startTimers();
-        geolocationServicePositionChanged(m_service.get());
+        makeSuccessCallbacks();
     } else {
         WTF::RefPtr<WebCore::PositionError> error = WebCore::PositionError::create(PositionError::PERMISSION_DENIED, "User disallowed GeoLocation");
@@ -271 +271 @@
 void Geolocation::geolocationServicePositionChanged(GeolocationService* service)
 {
-    ASSERT(service->lastPosition());
-    
-    requestPermission();
-    if (!isAllowed())
-        return;
-    
-    sendPositionToOneShots(service->lastPosition());
-    sendPositionToWatchers(service->lastPosition());
+    ASSERT_UNUSED(service, service == m_service);
+    ASSERT(m_service->lastPosition());
+    
+    if (!isAllowed()) {
+        // requestPermission() will ask the chrome for permission. This may be
+        // implemented synchronously or asynchronously. In both cases,
+        // makeSuccessCallbacks() will be called if permission is granted, so
+        // there's nothing more to do here.
+        requestPermission();
+        return;
+    }
+
+    makeSuccessCallbacks();
+}
+
+void Geolocation::makeSuccessCallbacks()
+{
+    ASSERT(m_service->lastPosition());
+    ASSERT(isAllowed());
+    
+    sendPositionToOneShots(m_service->lastPosition());
+    sendPositionToWatchers(m_service->lastPosition());
         
     m_oneShots.clear();

trunk/WebCore/page/Geolocation.h

@@ -103 +103 @@
     void startTimers();
     
+    void makeSuccessCallbacks();
     void handleError(PositionError*);