summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2012-10-17 16:21:14 +0200
commit8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch)
tree17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp
parentb9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff)
downloadqtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp')
-rw-r--r--Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp b/Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp
index 4c0ed9cd7..1eeac667b 100644
--- a/Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp
+++ b/Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp
@@ -64,7 +64,7 @@ bool WebGeolocationPermissionRequestManager::remove(const WebKit::WebGeolocation
GeolocationIdMap::iterator it = m_private->m_geolocationIdMap.find(geolocation);
if (it == m_private->m_geolocationIdMap.end())
return false;
- id = it->second;
+ id = it->value;
m_private->m_geolocationIdMap.remove(it);
m_private->m_idGeolocationMap.remove(id);
return true;
@@ -75,7 +75,7 @@ bool WebGeolocationPermissionRequestManager::remove(int id, WebKit::WebGeolocati
IdGeolocationMap::iterator it = m_private->m_idGeolocationMap.find(id);
if (it == m_private->m_idGeolocationMap.end())
return false;
- Geolocation* geolocation = it->second;
+ Geolocation* geolocation = it->value;
permissionRequest = WebGeolocationPermissionRequest(geolocation);
m_private->m_idGeolocationMap.remove(it);
m_private->m_geolocationIdMap.remove(geolocation);