diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-09-30 08:37:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-09-30 08:37:10 -0700 |
| commit | 0fade321435f38382c614ade7b64e6b68440d747 (patch) | |
| tree | d39936947a3b45a3b3415ecb7f6fa15322b6d52c /WebKit/android/WebCoreSupport | |
| parent | 8ce618ea67480ae663d52350339a95fff3d6f1f5 (diff) | |
| parent | 14e3d9bdf2270d399bae78946e3efe62a6c6c373 (diff) | |
| download | external_webkit-0fade321435f38382c614ade7b64e6b68440d747.zip external_webkit-0fade321435f38382c614ade7b64e6b68440d747.tar.gz external_webkit-0fade321435f38382c614ade7b64e6b68440d747.tar.bz2 | |
Merge commit 'remotes/goog/eclair' into eclair-release
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); |