Changeset 139925 in webkit

Timestamp:

Jan 16, 2013 2:31:18 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Remove bogus assert in GeolocationClientBlackBerry
​https://bugs.webkit.org/show_bug.cgi?id=105651

Patch by Joe Mason <​jmason@rim.com> on 2013-01-16
Reviewed by Darin Adler.

GeolocationClientBlackBerry::cancelPermissionRequest contains an ASSERT that the origin is
in m_geolocationRequestMap. But it's perfectly valid for the origin to not be in the map -
for instance, if GeolocationClientBlackBerry::requestPermission returned immediately,
without putting it in the map, because geolocation was disabled. In this case the correct
thing to do is just return - there is nothing to be done to cancel the permission.

• WebCoreSupport/GeolocationClientBlackBerry.cpp:

(GeolocationClientBlackBerry::cancelPermissionRequest):

Location:

trunk/Source/WebKit/blackberry

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/GeolocationClientBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-01-16  Joe Mason  <jmason@rim.com>
+
+        [BlackBerry] Remove bogus assert in GeolocationClientBlackBerry
+        https://bugs.webkit.org/show_bug.cgi?id=105651
+
+        Reviewed by Darin Adler.
+
+        GeolocationClientBlackBerry::cancelPermissionRequest contains an ASSERT that the origin is
+        in m_geolocationRequestMap. But it's perfectly valid for the origin to not be in the map -
+        for instance, if GeolocationClientBlackBerry::requestPermission returned immediately,
+        without putting it in the map, because geolocation was disabled. In this case the correct
+        thing to do is just return - there is nothing to be done to cancel the permission.
+
+        * WebCoreSupport/GeolocationClientBlackBerry.cpp:
+        (GeolocationClientBlackBerry::cancelPermissionRequest):
+
 2013-01-15  Mike Fenton  <mifenton@rim.com>
 

trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp

@@ -131 +131 @@
     // Remove the geolocation from the pending permission map.
     HashMap<String, Vector<RefPtr<Geolocation> > >::iterator it = m_geolocationRequestMap.find(origin);
-
-    ASSERT(it != m_geolocationRequestMap.end());
     if (it == m_geolocationRequestMap.end())
         return;