From 8995b83bcbfbb68245f779b64e5517627c6cc6ea Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 17 Oct 2012 16:21:14 +0200 Subject: 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 --- Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/WebKit/chromium/src/WebGeolocationPermissionRequestManager.cpp') 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); -- cgit v1.2.1