Bug 1184468 - Use nsTHashtable::Keys where possible. r=xpcom-reviewers,nika

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

Author: sigiesec

dom/animation/EffectCompositor.cpp

@@ -53,8 +53,8 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END
 
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(EffectCompositor)
   for (const auto& elementSet : tmp->mElementsToRestyle) {
-    for (const auto& element : elementSet) {
-      CycleCollectionNoteChild(cb, element.GetKey().mElement,
+    for (const auto& key : elementSet.Keys()) {
+      CycleCollectionNoteChild(cb, key.mElement,
                                "EffectCompositor::mElementsToRestyle[]",
                                cb.Flags());
     }

dom/base/Element.cpp

@@ -3932,8 +3932,7 @@ static void IntersectionObserverPropertyDtor(void* aObject,
                                              void* aData) {
   auto* element = static_cast<Element*>(aObject);
   auto* observers = static_cast<IntersectionObserverList*>(aPropertyValue);
-  for (const auto& entry : *observers) {
-    DOMIntersectionObserver* observer = entry.GetKey();
+  for (DOMIntersectionObserver* observer : observers->Keys()) {
     observer->UnlinkTarget(*element);
   }
   delete observers;

dom/base/ImageTracker.cpp

@@ -104,8 +104,7 @@ nsresult ImageTracker::SetLockingState(bool aLocked) {
   if (mLocking == aLocked) return NS_OK;
 
   // Otherwise, iterate over our images and perform the appropriate action.
-  for (const auto& entry : mImages) {
-    imgIRequest* image = entry.GetKey();
+  for (imgIRequest* image : mImages.Keys()) {
     if (aLocked) {
       image->LockImage();
     } else {
@@ -124,8 +123,7 @@ void ImageTracker::SetAnimatingState(bool aAnimating) {
   if (mAnimating == aAnimating) return;
 
   // Otherwise, iterate over our images and perform the appropriate action.
-  for (const auto& entry : mImages) {
-    imgIRequest* image = entry.GetKey();
+  for (imgIRequest* image : mImages.Keys()) {
     if (aAnimating) {
       image->IncrementAnimationConsumers();
     } else {
@@ -138,8 +136,8 @@ void ImageTracker::SetAnimatingState(bool aAnimating) {
 }
 
 void ImageTracker::RequestDiscardAll() {
-  for (const auto& entry : mImages) {
-    entry.GetKey()->RequestDiscard();
+  for (imgIRequest* image : mImages.Keys()) {
+    image->RequestDiscard();
   }
 }
 
@@ -153,8 +151,7 @@ void ImageTracker::MediaFeatureValuesChangedAllDocuments(
   // Pull the images out into an array and iterate over them, in case the
   // image notifications do something that ends up modifying the table.
   nsTArray<nsCOMPtr<imgIContainer>> images;
-  for (const auto& entry : mImages) {
-    imgIRequest* req = entry.GetKey();
+  for (imgIRequest* req : mImages.Keys()) {
     nsCOMPtr<imgIContainer> image;
     req->GetImage(getter_AddRefs(image));
     if (!image) {

dom/commandhandler/nsControllerCommandTable.cpp

@@ -171,11 +171,8 @@ nsControllerCommandTable::GetCommandState(const char* aCommandName,
 
 NS_IMETHODIMP
 nsControllerCommandTable::GetSupportedCommands(nsTArray<nsCString>& aCommands) {
-  aCommands.SetCapacity(mCommandsTable.Count());
+  mozilla::AppendToArray(aCommands, mCommandsTable.Keys());
 
-  for (auto iter = mCommandsTable.Iter(); !iter.Done(); iter.Next()) {
-    aCommands.AppendElement(iter.Key());
-  }
   return NS_OK;
 }
 

dom/gamepad/GamepadManager.cpp

@@ -169,8 +169,8 @@ void GamepadManager::RemoveListener(nsGlobalWindowInner* aWindow) {
     return;  // doesn't exist
   }
 
-  for (auto iter = mGamepads.ConstIter(); !iter.Done(); iter.Next()) {
-    aWindow->RemoveGamepad(iter.Key());
+  for (const auto& key : mGamepads.Keys()) {
+    aWindow->RemoveGamepad(key);
   }
 
   mListeners.RemoveElement(aWindow);

dom/html/HTMLFormControlsCollection.cpp

@@ -309,9 +309,7 @@ void HTMLFormControlsCollection::GetSupportedNames(nsTArray<nsString>& aNames) {
   // Just enumerate mNameLookupTable.  This won't guarantee order, but
   // that's OK, because the HTML5 spec doesn't define an order for
   // this enumeration.
-  for (auto iter = mNameLookupTable.Iter(); !iter.Done(); iter.Next()) {
-    aNames.AppendElement(iter.Key());
-  }
+  AppendToArray(aNames, mNameLookupTable.Keys());
 }
 
 /* virtual */

dom/html/HTMLMediaElement.cpp

@@ -3559,10 +3559,8 @@ void HTMLMediaElement::UpdateOutputTrackSources() {
   }
 
   // ...and all MediaElementTrackSources.
-  AutoTArray<nsString, 4> trackSourcesToRemove;
-  for (const auto& entry : mOutputTrackSources) {
-    trackSourcesToRemove.AppendElement(entry.GetKey());
-  }
+  auto trackSourcesToRemove =
+      ToTArray<AutoTArray<nsString, 4>>(mOutputTrackSources.Keys());
 
   // Then work out the differences.
   mediaTracksToAdd.RemoveLastElements(

dom/ipc/SharedStringMap.cpp

@@ -90,10 +90,7 @@ Result<Ok, nsresult> SharedStringMapBuilder::Finalize(
 
   MOZ_ASSERT(mEntries.Count() == mKeyTable.Count());
 
-  nsTArray<nsCString> keys(mEntries.Count());
-  for (auto iter = mEntries.Iter(); !iter.Done(); iter.Next()) {
-    keys.AppendElement(iter.Key());
-  }
+  auto keys = ToTArray<nsTArray<nsCString>>(mEntries.Keys());
   keys.Sort();
 
   Header header = {kSharedStringMapMagic, uint32_t(keys.Length())};

dom/localstorage/LSSnapshot.cpp

@@ -318,9 +318,7 @@ nsresult LSSnapshot::GetKeys(nsTArray<nsString>& aKeys) {
     return rv;
   }
 
-  for (auto iter = mValues.ConstIter(); !iter.Done(); iter.Next()) {
-    aKeys.AppendElement(iter.Key());
-  }
+  AppendToArray(aKeys, mValues.Keys());
 
   return NS_OK;
 }

dom/media/gmp/GMPServiceChild.cpp

@@ -498,11 +498,7 @@ void GMPServiceChild::RemoveGMPContentParent(
 
 void GMPServiceChild::GetAlreadyBridgedTo(
     nsTArray<base::ProcessId>& aAlreadyBridgedTo) {
-  aAlreadyBridgedTo.SetCapacity(mContentParents.Count());
-  for (auto iter = mContentParents.Iter(); !iter.Done(); iter.Next()) {
-    const uint64_t& id = iter.Key();
-    aAlreadyBridgedTo.AppendElement(id);
-  }
+  AppendToArray(aAlreadyBridgedTo, mContentParents.Keys());
 }
 
 class OpenPGMPServiceChild : public mozilla::Runnable {