Bug 1645339 - Use range-based for with nsTObserverArray in dom/events. r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D79501

dom/events/EventListenerManager.cpp

@@ -1198,13 +1198,12 @@ void EventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
   EventMessage eventMessage = aEvent->mMessage;
 
   while (true) {
-    nsAutoTObserverArray<Listener, 2>::EndLimitedIterator iter(mListeners);
     Maybe<EventMessageAutoOverride> legacyAutoOverride;
-    while (iter.HasMore()) {
+    for (Listener& listenerRef : mListeners.EndLimitedRange()) {
       if (aEvent->mFlags.mImmediatePropagationStopped) {
         break;
       }
-      Listener* listener = &iter.GetNext();
+      Listener* listener = &listenerRef;
       // Check that the phase is same in event and event listener.
       // Handle only trusted events, except when listener permits untrusted
       // events.
@@ -1334,9 +1333,9 @@ void EventListenerManager::HandleEventInternal(nsPresContext* aPresContext,
       // This is a device-type event, we need to check whether we can
       // disable device after removing the once listeners.
       bool hasAnyListener = false;
-      nsAutoTObserverArray<Listener, 2>::ForwardIterator iter(mListeners);
-      while (iter.HasMore()) {
-        Listener* listener = &iter.GetNext();
+      // XXX We could use a NonObservingRange here and std::any_of.
+      for (Listener& listenerRef : mListeners.ForwardRange()) {
+        Listener* listener = &listenerRef;
         if (EVENT_TYPE_EQUALS(listener, aEvent->mMessage,
                               aEvent->mSpecifiedEventType,
                               /* all events */ false)) {
@@ -1504,9 +1503,7 @@ nsresult EventListenerManager::GetListenerInfo(
   nsCOMPtr<EventTarget> target = mTarget;
   NS_ENSURE_STATE(target);
   aList.Clear();
-  nsAutoTObserverArray<Listener, 2>::ForwardIterator iter(mListeners);
-  while (iter.HasMore()) {
-    const Listener& listener = iter.GetNext();
+  for (const Listener& listener : mListeners.ForwardRange()) {
     // If this is a script handler and we haven't yet
     // compiled the event handler itself go ahead and compile it
     if (listener.mListenerType == Listener::eJSEventListener &&

dom/events/EventListenerService.cpp

@@ -385,10 +385,8 @@ void EventListenerService::NotifyPendingChanges() {
   mPendingListenerChanges.swap(changes);
   mPendingListenerChangesSet.Clear();
 
-  nsTObserverArray<nsCOMPtr<nsIListenerChangeListener>>::EndLimitedIterator
-      iter(mChangeListeners);
-  while (iter.HasMore()) {
-    nsCOMPtr<nsIListenerChangeListener> listener = iter.GetNext();
+  for (nsCOMPtr<nsIListenerChangeListener> listener :
+       mChangeListeners.EndLimitedRange()) {
     listener->ListenersChanged(changes);
   }
 }