| Index: third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| diff --git a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| index 970e2c1a4aaf222631eab10a5990756b7c302e1a..822c2d89739c7a3d326358ce79bd7450a1f38369 100644
|
| --- a/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| +++ b/third_party/WebKit/Source/modules/geolocation/Geolocation.cpp
|
| @@ -233,7 +233,7 @@ void Geolocation::startRequest(GeoNotifier* notifier) {
|
|
|
| void Geolocation::fatalErrorOccurred(GeoNotifier* notifier) {
|
| // This request has failed fatally. Remove it from our lists.
|
| - m_oneShots.remove(notifier);
|
| + m_oneShots.erase(notifier);
|
| m_watchers.remove(notifier);
|
|
|
| if (!hasListeners())
|
| @@ -248,7 +248,7 @@ void Geolocation::requestUsesCachedPosition(GeoNotifier* notifier) {
|
| // If this is a one-shot request, stop it. Otherwise, if the watch still
|
| // exists, start the service to get updates.
|
| if (m_oneShots.contains(notifier)) {
|
| - m_oneShots.remove(notifier);
|
| + m_oneShots.erase(notifier);
|
| } else if (m_watchers.contains(notifier)) {
|
| if (notifier->options().timeout())
|
| startUpdating(notifier);
|
| @@ -261,7 +261,7 @@ void Geolocation::requestUsesCachedPosition(GeoNotifier* notifier) {
|
|
|
| void Geolocation::requestTimedOut(GeoNotifier* notifier) {
|
| // If this is a one-shot request, stop it.
|
| - m_oneShots.remove(notifier);
|
| + m_oneShots.erase(notifier);
|
|
|
| if (!hasListeners())
|
| stopUpdating();
|
| @@ -282,7 +282,7 @@ void Geolocation::clearWatch(int watchID) {
|
| return;
|
|
|
| if (GeoNotifier* notifier = m_watchers.find(watchID))
|
| - m_pendingForPermissionNotifiers.remove(notifier);
|
| + m_pendingForPermissionNotifiers.erase(notifier);
|
| m_watchers.remove(watchID);
|
|
|
| if (!hasListeners())
|
|
|