diff options
| author | Patrick Scott <phanna@android.com> | 2009-09-29 09:43:03 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2009-09-29 11:26:24 -0400 |
| commit | 06f1ecff0f609438be162b71b50a3be08983df23 (patch) | |
| tree | 5a4a98c24c024f95585e248030164a12ca0bfb34 /WebKit/android/WebCoreSupport | |
| parent | 1e67e45d20ead40b0407618abbc5e20840dc3c80 (diff) | |
| download | external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.zip external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.tar.gz external_webkit-06f1ecff0f609438be162b71b50a3be08983df23.tar.bz2 | |
Fix a few crashes with assertions enabled.
KURL::protocolIs no longer likes "javascript" and has a different method called
protocolIsJavaScript.
Diffstat (limited to 'WebKit/android/WebCoreSupport')
| -rwxr-xr-x | WebKit/android/WebCoreSupport/GeolocationPermissions.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp b/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp index a0b234b..b77edd3 100755 --- a/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp +++ b/WebKit/android/WebCoreSupport/GeolocationPermissions.cpp @@ -181,7 +181,10 @@ void GeolocationPermissions::cancelPendingRequests(String origin) if (index != WTF::notFound) { // Get the permission from the permanent list. PermissionsMap::const_iterator iter = s_permanentPermissions.find(origin); - ASSERT(iter != (PermissionsMap::const_iterator end = s_permanentPermissions.end())); +#ifndef NDEBUG + PermissionsMap::const_iterator end = s_permanentPermissions.end(); + ASSERT(iter != end); +#endif bool allow = iter->second; maybeCallbackFrames(origin, allow); |