Make the geolocation code use C++11 for-ranges

Source/modules/geolocation/Geolocation.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 223 matching lines @@
 
     // Request permissions, which may be synchronous or asynchronous.
     requestPermission();
 }
 
 void Geolocation::makeCachedPositionCallbacks()
 {
     // All modifications to m_requestsAwaitingCachedPosition are done
     // asynchronously, so we don't need to worry about it being modified from
     // the callbacks.
-    GeoNotifierSet::const_iterator end = m_requestsAwaitingCachedPosition.end();
-    for (GeoNotifierSet::const_iterator iter = m_requestsAwaitingCachedPosition.begin(); iter != end; ++iter) {
-        GeoNotifier* notifier = iter->get();
+    for (GeoNotifier* notifier : m_requestsAwaitingCachedPosition) {

[Mike West, 2014/10/16 19:38:15]

As you're replacing a const_iteratore, please s/GeoNotifier*/const GeoNotifier*/
here and elsewhere.

[kenneth.christiansen, 2014/10/16 22:33:05]

That would be a bigger change :-) I am fine to do it but involves changes other
files as well.

const_iterator on a collection of pointers means that the pointers are constant,
not the objects they point to.

Take the below, for instance:

    GeoNotifierVector::const_iterator end = notifiers.end();
    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end;
++it)
        (*it)->runErrorCallback(error);

Here the runErrorCallback method is not declared const but it allows me to call
it anyway, that is not the case with a "for (const GeoNotifier* notifier :
notifiers)" which would bail out like this:

error: member function 'runErrorCallback' not viable: 'this' argument has type
'const blink::GeoNotifier', but function is not marked const
        notifier->runErrorCallback(error);

         notifier->runSuccessCallback(lastPosition());
 
         // 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);
         else if (m_watchers.contains(notifier)) {
             if (!notifier->options()->timeout() || startUpdating(notifier))
                 notifier->startTimer();
             else
@@ skipping 64 matching lines @@
     // If any of the requests are waiting for permission for a cached position,
     // the position from the service will be at least as fresh.
     if (lastPosition())
         makeSuccessCallbacks();
     else
         makeCachedPositionCallbacks();
 }
 
 void Geolocation::sendError(GeoNotifierVector& notifiers, PositionError* error)
 {
-    GeoNotifierVector::const_iterator end = notifiers.end();
-    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it)
-        (*it)->runErrorCallback(error);
+    for (GeoNotifier* notifier : notifiers)
+        notifier->runErrorCallback(error);
 }
 
 void Geolocation::sendPosition(GeoNotifierVector& notifiers, Geoposition* position)
 {
-    GeoNotifierVector::const_iterator end = notifiers.end();
-    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it)
-        (*it)->runSuccessCallback(position);
+    for (GeoNotifier* notifier : notifiers)
+        notifier->runSuccessCallback(position);
 }
 
 void Geolocation::stopTimer(GeoNotifierVector& notifiers)
 {
-    GeoNotifierVector::const_iterator end = notifiers.end();
-    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it)
-        (*it)->stopTimer();
+    for (GeoNotifier* notifier : notifiers)
+        notifier->stopTimer();
 }
 
 void Geolocation::stopTimersForOneShots()
 {
     GeoNotifierVector copy;
     copyToVector(m_oneShots, copy);
 
     stopTimer(copy);
 }
 
 void Geolocation::stopTimersForWatchers()
 {
     GeoNotifierVector copy;
     m_watchers.getNotifiersVector(copy);
 
     stopTimer(copy);
 }
 
 void Geolocation::stopTimers()
 {
     stopTimersForOneShots();
     stopTimersForWatchers();
 }
 
 void Geolocation::cancelRequests(GeoNotifierVector& notifiers)
 {
-    GeoNotifierVector::const_iterator end = notifiers.end();
-    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it)
-        (*it)->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, framelessDocumentErrorMessage));
+    for (GeoNotifier* notifier : notifiers)
+        notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, framelessDocumentErrorMessage));
 }
 
 void Geolocation::cancelAllRequests()
 {
     GeoNotifierVector copy;
     copyToVector(m_oneShots, copy);
     cancelRequests(copy);
     m_watchers.getNotifiersVector(copy);
     cancelRequests(copy);
 }
 
 void Geolocation::extractNotifiersWithCachedPosition(GeoNotifierVector& notifiers, GeoNotifierVector* cached)
 {
     GeoNotifierVector nonCached;
-    GeoNotifierVector::iterator end = notifiers.end();
-    for (GeoNotifierVector::const_iterator it = notifiers.begin(); it != end; ++it) {
-        GeoNotifier* notifier = it->get();
+    for (GeoNotifier* notifier : notifiers) {
         if (notifier->useCachedPosition()) {
             if (cached)
                 cached->append(notifier);
         } else
             nonCached.append(notifier);
     }
     notifiers.swap(nonCached);
 }
 
 void Geolocation::copyToSet(const GeoNotifierVector& src, GeoNotifierSet& dest)
 {
-     GeoNotifierVector::const_iterator end = src.end();
-     for (GeoNotifierVector::const_iterator it = src.begin(); it != end; ++it) {
-         GeoNotifier* notifier = it->get();
+    for (GeoNotifier* notifier : src)
          dest.add(notifier);
-     }
 }
 
 void Geolocation::handleError(PositionError* error)
 {
     ASSERT(error);
 
     GeoNotifierVector oneShotsCopy;
     copyToVector(m_oneShots, oneShotsCopy);
 
     GeoNotifierVector watchersCopy;
@@ skipping 98 matching lines @@
     LocalFrame* frame = this->frame();
     if (!frame)
         return;
 
     GeolocationController::from(frame)->removeObserver(this);
 }
 
 void Geolocation::handlePendingPermissionNotifiers()
 {
     // While we iterate through the list, we need not worry about list being modified as the permission
-    // is already set to Yes/No and no new listeners will be added to the pending list
-    GeoNotifierSet::const_iterator end = m_pendingForPermissionNotifiers.end();
-    for (GeoNotifierSet::const_iterator iter = m_pendingForPermissionNotifiers.begin(); iter != end; ++iter) {
-        GeoNotifier* notifier = iter->get();
-
+    // is already set to Yes/No and no new listeners will be added to the pending list.
+    for (GeoNotifier* notifier : m_pendingForPermissionNotifiers) {
         if (isAllowed()) {
             // start all pending notification requests as permission granted.
             // The notifier is always ref'ed by m_oneShots or m_watchers.
             if (startUpdating(notifier))
                 notifier->startTimer();
             else
                 notifier->setFatalError(PositionError::create(PositionError::POSITION_UNAVAILABLE, failedToStartServiceErrorMessage));
         } else {
             notifier->setFatalError(PositionError::create(PositionError::PERMISSION_DENIED, permissionDeniedErrorMessage));
         }
     }
 }
 
 } // namespace blink