Title: [139925] trunk/Source/WebKit/blackberry
- Revision
- 139925
- Author
- [email protected]
- Date
- 2013-01-16 14:31:18 -0800 (Wed, 16 Jan 2013)
Log Message
[BlackBerry] Remove bogus assert in GeolocationClientBlackBerry
https://bugs.webkit.org/show_bug.cgi?id=105651
Patch by Joe Mason <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/ChangeLog (139924 => 139925)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-01-16 22:08:02 UTC (rev 139924)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-01-16 22:31:18 UTC (rev 139925)
@@ -1,3 +1,19 @@
+2013-01-16 Joe Mason <[email protected]>
+
+ [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 <[email protected]>
[BlackBerry] Don't overwrite field dir with current locale.
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp (139924 => 139925)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp 2013-01-16 22:08:02 UTC (rev 139924)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/GeolocationClientBlackBerry.cpp 2013-01-16 22:31:18 UTC (rev 139925)
@@ -130,8 +130,6 @@
// 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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
