Bug 1691913 - Rename nsBaseHashtable::GetOrInsert(With) to LookupOrIn…

…sert(With). r=xpcom-reviewers,necko-reviewers,jgilbert,dragana,nika The functions should be called "Lookup" rather than "Get" because they return a DataType& (rather than UserDataType). Differential Revision: https://phabricator.services.mozilla.com/D105472
dothq · Feb 26, 2021 · 4f75368 · 4f75368
1 parent d57c853
commit 4f75368
Show file tree

Hide file tree

Showing 83 changed files with 225 additions and 211 deletions.
diff --git a/accessible/base/NotificationController.cpp b/accessible/base/NotificationController.cpp
@@ -532,7 +532,7 @@ void NotificationController::ProcessMutationEvents() {
     }
 
     LocalAccessible* parent = event->GetAccessible()->LocalParent();
-    showEvents.GetOrInsert(parent).AppendElement(event);
+    showEvents.LookupOrInsert(parent).AppendElement(event);
   }
 
   // We need to fire show events for the children of an accessible in the order

diff --git a/accessible/generic/DocAccessible-inl.h b/accessible/generic/DocAccessible-inl.h
@@ -165,12 +165,13 @@ inline DocAccessible::AttrRelProviders* DocAccessible::GetOrCreateRelProviders(
       aElement->GetUncomposedDocOrConnectedShadowRoot();
   DependentIDsHashtable* hash =
       mDependentIDsHashes
-          .GetOrInsertWith(docOrShadowRoot,
-                           [] { return MakeUnique<DependentIDsHashtable>(); })
+          .LookupOrInsertWith(
+              docOrShadowRoot,
+              [] { return MakeUnique<DependentIDsHashtable>(); })
           .get();
 
   return hash
-      ->GetOrInsertWith(aID, [] { return MakeUnique<AttrRelProviders>(); })
+      ->LookupOrInsertWith(aID, [] { return MakeUnique<AttrRelProviders>(); })
       .get();
 }
 

diff --git a/docshell/base/BrowsingContextGroup.cpp b/docshell/base/BrowsingContextGroup.cpp
@@ -34,8 +34,9 @@ already_AddRefed<BrowsingContextGroup> BrowsingContextGroup::GetOrCreate(
     ClearOnShutdown(&sBrowsingContextGroups);
   }
 
-  RefPtr<BrowsingContextGroup> group = sBrowsingContextGroups->GetOrInsertWith(
-      aId, [&aId] { return do_AddRef(new BrowsingContextGroup(aId)); });
+  RefPtr<BrowsingContextGroup> group =
+      sBrowsingContextGroups->LookupOrInsertWith(
+          aId, [&aId] { return do_AddRef(new BrowsingContextGroup(aId)); });
   return group.forget();
 }
 
@@ -403,7 +404,7 @@ already_AddRefed<DocGroup> BrowsingContextGroup::AddDocument(
     const nsACString& aKey, Document* aDocument) {
   MOZ_ASSERT(NS_IsMainThread());
 
-  RefPtr<DocGroup>& docGroup = mDocGroups.GetOrInsertWith(
+  RefPtr<DocGroup>& docGroup = mDocGroups.LookupOrInsertWith(
       aKey, [&] { return DocGroup::Create(this, aKey); });
 
   docGroup->AddDocument(aDocument);

diff --git a/docshell/base/WindowContext.cpp b/docshell/base/WindowContext.cpp
@@ -352,7 +352,7 @@ void WindowContext::Init() {
     gWindowContexts = new WindowContextByIdMap();
     ClearOnShutdown(&gWindowContexts);
   }
-  auto& entry = gWindowContexts->GetOrInsert(mInnerWindowId);
+  auto& entry = gWindowContexts->LookupOrInsert(mInnerWindowId);
   MOZ_RELEASE_ASSERT(!entry, "Duplicate WindowContext for ID!");
   entry = this;
 

diff --git a/dom/animation/EffectCompositor.cpp b/dom/animation/EffectCompositor.cpp
@@ -240,7 +240,7 @@ void EffectCompositor::RequestRestyle(dom::Element* aElement,
   auto& elementsToRestyle = mElementsToRestyle[aCascadeLevel];
   PseudoElementHashEntry::KeyType key = {aElement, aPseudoType};
 
-  bool& restyleEntry = elementsToRestyle.GetOrInsert(key, false);
+  bool& restyleEntry = elementsToRestyle.LookupOrInsert(key, false);
   if (aRestyleType == RestyleType::Throttled) {
     mPresContext->PresShell()->SetNeedThrottledAnimationFlush();
   } else {

diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -812,7 +812,7 @@ Document* ExternalResourceMap::RequestResource(
     return resource->mDocument;
   }
 
-  RefPtr<PendingLoad>& loadEntry = mPendingLoads.GetOrInsert(clone);
+  RefPtr<PendingLoad>& loadEntry = mPendingLoads.LookupOrInsert(clone);
   if (loadEntry) {
     RefPtr<PendingLoad> load(loadEntry);
     load.forget(aPendingLoad);

diff --git a/dom/base/Document.h b/dom/base/Document.h
@@ -1635,7 +1635,7 @@ class Document : public nsINode,
     RawServoSelectorList* GetListOrInsertFrom(const nsACString& aSelector,
                                               F&& aFrom) {
       MOZ_ASSERT(NS_IsMainThread());
-      return mTable.GetOrInsertWith(aSelector, std::forward<F>(aFrom)).get();
+      return mTable.LookupOrInsertWith(aSelector, std::forward<F>(aFrom)).get();
     }
 
     ~SelectorCache();

diff --git a/dom/base/DocumentOrShadowRoot.cpp b/dom/base/DocumentOrShadowRoot.cpp
@@ -218,7 +218,7 @@ void DocumentOrShadowRoot::CloneAdoptedSheetsFrom(
   MOZ_ASSERT(clonedSheetMap);
 
   for (const StyleSheet* sheet : aSource.mAdoptedStyleSheets) {
-    RefPtr<StyleSheet> clone = clonedSheetMap->GetOrInsertWith(
+    RefPtr<StyleSheet> clone = clonedSheetMap->LookupOrInsertWith(
         sheet, [&] { return sheet->CloneAdoptedSheet(ownerDoc); });
     MOZ_ASSERT(clone);
     MOZ_DIAGNOSTIC_ASSERT(clone->ConstructorDocumentMatches(ownerDoc));
@@ -753,7 +753,8 @@ nsRadioGroupStruct* DocumentOrShadowRoot::GetRadioGroup(
 nsRadioGroupStruct* DocumentOrShadowRoot::GetOrCreateRadioGroup(
     const nsAString& aName) {
   return mRadioGroups
-      .GetOrInsertWith(aName, [] { return MakeUnique<nsRadioGroupStruct>(); })
+      .LookupOrInsertWith(aName,
+                          [] { return MakeUnique<nsRadioGroupStruct>(); })
       .get();
 }
 

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
@@ -3959,7 +3959,7 @@ void Element::RegisterIntersectionObserver(DOMIntersectionObserver* aObserver) {
   //         notification task being scheduled.
   //   -1:   Non-intersecting.
   //   >= 0: Intersecting, valid index of aObserver->mThresholds.
-  Unused << observers->GetOrInsert(aObserver, eUninitialized);
+  observers->LookupOrInsert(aObserver, eUninitialized);
 }
 
 void Element::UnregisterIntersectionObserver(

diff --git a/dom/base/EventSourceEventService.cpp b/dom/base/EventSourceEventService.cpp
@@ -203,8 +203,8 @@ EventSourceEventService::AddListener(uint64_t aInnerWindowID,
 
   WindowListener* listener =
       mWindows
-          .GetOrInsertWith(aInnerWindowID,
-                           [] { return MakeUnique<WindowListener>(); })
+          .LookupOrInsertWith(aInnerWindowID,
+                              [] { return MakeUnique<WindowListener>(); })
           .get();
 
   listener->mListeners.AppendElement(aListener);

diff --git a/dom/base/ResizeObserver.cpp b/dom/base/ResizeObserver.cpp
@@ -150,7 +150,7 @@ void ResizeObserver::Observe(Element& aTarget,
     mDocument->AddResizeObserver(*this);
   }
 
-  auto& observation = mObservationMap.GetOrInsert(&aTarget);
+  auto& observation = mObservationMap.LookupOrInsert(&aTarget);
   if (observation) {
     if (observation->BoxOptions() == aOptions.mBox) {
       // Already observed this target and the observed box is the same, so

diff --git a/dom/base/nsDOMAttributeMap.cpp b/dom/base/nsDOMAttributeMap.cpp
@@ -118,7 +118,7 @@ Attr* nsDOMAttributeMap::GetAttribute(mozilla::dom::NodeInfo* aNodeInfo) {
 
   nsAttrKey attr(aNodeInfo->NamespaceID(), aNodeInfo->NameAtom());
 
-  return mAttributeCache.GetOrInsertWith(attr, [&] {
+  return mAttributeCache.LookupOrInsertWith(attr, [&] {
     // Newly inserted entry!
     RefPtr<mozilla::dom::NodeInfo> ni = aNodeInfo;
     auto* nim = ni->NodeInfoManager();

diff --git a/dom/base/nsDOMMutationObserver.cpp b/dom/base/nsDOMMutationObserver.cpp
@@ -322,7 +322,7 @@ void nsMutationReceiver::ContentRemoved(nsIContent* aChild,
       auto* const transientReceivers =
           Observer()
               ->mTransientReceivers
-              .GetOrInsertWith(
+              .LookupOrInsertWith(
                   aChild,
                   [&isNewEntry] {
                     isNewEntry = true;
@@ -1040,7 +1040,7 @@ void nsAutoMutationBatch::Done() {
       if (allObservers.Length()) {
         auto* const transientReceivers =
             ob->mTransientReceivers
-                .GetOrInsertWith(
+                .LookupOrInsertWith(
                     removed,
                     [] { return MakeUnique<nsCOMArray<nsMutationReceiver>>(); })
                 .get();

diff --git a/dom/base/nsFrameMessageManager.cpp b/dom/base/nsFrameMessageManager.cpp
@@ -241,7 +241,7 @@ void nsFrameMessageManager::AddMessageListener(const nsAString& aMessageName,
                                                ErrorResult& aError) {
   auto* const listeners =
       mListeners
-          .GetOrInsertWith(
+          .LookupOrInsertWith(
               aMessageName,
               [] {
                 return MakeUnique<
@@ -316,7 +316,7 @@ void nsFrameMessageManager::AddWeakMessageListener(
 
   auto* const listeners =
       mListeners
-          .GetOrInsertWith(
+          .LookupOrInsertWith(
               aMessageName,
               [] {
                 return MakeUnique<

diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp
@@ -7161,7 +7161,7 @@ ChromeMessageBroadcaster* nsGlobalWindowInner::GetGroupMessageManager(
   MOZ_ASSERT(IsChromeWindow());
 
   return mChromeFields.mGroupMessageManagers
-      .GetOrInsertWith(
+      .LookupOrInsertWith(
           aGroup,
           [&] {
             return MakeAndAddRef<ChromeMessageBroadcaster>(MessageManager());

diff --git a/dom/broadcastchannel/BroadcastChannelService.cpp b/dom/broadcastchannel/BroadcastChannelService.cpp
@@ -83,7 +83,7 @@ void BroadcastChannelService::RegisterActor(
 
   auto* const parents =
       mAgents
-          .GetOrInsertWith(
+          .LookupOrInsertWith(
               aOriginChannelKey,
               [] { return MakeUnique<nsTArray<BroadcastChannelParent*>>(); })
           .get();

diff --git a/dom/clients/manager/ClientManagerService.cpp b/dom/clients/manager/ClientManagerService.cpp
@@ -254,7 +254,7 @@ ClientSourceParent* ClientManagerService::FindSource(
 
 void ClientManagerService::WaitForSource(ClientHandleParent* aHandle,
                                          const nsID& aID) {
-  auto& entry = mPendingHandles.GetOrInsert(aID);
+  auto& entry = mPendingHandles.LookupOrInsert(aID);
   entry.AppendElement(aHandle);
 }
 

diff --git a/dom/commandhandler/nsCommandManager.cpp b/dom/commandhandler/nsCommandManager.cpp
@@ -82,8 +82,9 @@ nsCommandManager::AddCommandObserver(nsIObserver* aCommandObserver,
   // for each command in the table, we make a list of observers for that command
   auto* const commandObservers =
       mObserversTable
-          .GetOrInsertWith(aCommandToObserve,
-                           [] { return mozilla::MakeUnique<ObserverList>(); })
+          .LookupOrInsertWith(
+              aCommandToObserve,
+              [] { return mozilla::MakeUnique<ObserverList>(); })
           .get();
 
   // need to check that this command observer hasn't already been registered

diff --git a/dom/events/EventListenerService.cpp b/dom/events/EventListenerService.cpp
@@ -374,7 +374,7 @@ void EventListenerService::NotifyAboutMainThreadListenerChangeInternal(
   }
 
   RefPtr<EventListenerChange> changes =
-      mPendingListenerChangesSet.GetOrInsertWith(aTarget, [&] {
+      mPendingListenerChangesSet.LookupOrInsertWith(aTarget, [&] {
         auto c = MakeRefPtr<EventListenerChange>(aTarget);
         mPendingListenerChanges->AppendElement(c);
         return c;

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
@@ -4690,8 +4690,8 @@ OverOutElementsWrapper* EventStateManager::GetWrapperByEventID(
     return mMouseEnterLeaveHelper;
   }
   return mPointersEnterLeaveHelper
-      .GetOrInsertWith(pointer->pointerId,
-                       [] { return new OverOutElementsWrapper(); })
+      .LookupOrInsertWith(pointer->pointerId,
+                          [] { return new OverOutElementsWrapper(); })
       .get();
 }
 

diff --git a/dom/filehandle/ActorsParent.cpp b/dom/filehandle/ActorsParent.cpp
@@ -674,7 +674,7 @@ void FileHandleThreadPool::Enqueue(FileHandle* aFileHandle,
 
   DirectoryInfo* directoryInfo =
       mDirectoryInfos
-          .GetOrInsertWith(
+          .LookupOrInsertWith(
               directoryId,
               [&] { return UniquePtr<DirectoryInfo>(new DirectoryInfo(this)); })
           .get();

diff --git a/dom/html/HTMLAllCollection.cpp b/dom/html/HTMLAllCollection.cpp
@@ -105,12 +105,13 @@ static bool DocAllResultMatch(Element* aElement, int32_t aNamespaceID,
 
 nsContentList* HTMLAllCollection::GetDocumentAllList(const nsAString& aID) {
   return mNamedMap
-      .GetOrInsertWith(aID,
-                       [this, &aID] {
-                         RefPtr<nsAtom> id = NS_Atomize(aID);
-                         return new nsContentList(mDocument, DocAllResultMatch,
-                                                  nullptr, nullptr, true, id);
-                       })
+      .LookupOrInsertWith(aID,
+                          [this, &aID] {
+                            RefPtr<nsAtom> id = NS_Atomize(aID);
+                            return new nsContentList(mDocument,
+                                                     DocAllResultMatch, nullptr,
+                                                     nullptr, true, id);
+                          })
       .get();
 }
 

diff --git a/dom/html/HTMLFormElement.cpp b/dom/html/HTMLFormElement.cpp
@@ -2147,7 +2147,7 @@ HTMLFormElement::WalkRadioGroup(const nsAString& aName,
 void HTMLFormElement::AddToRadioGroup(const nsAString& aName,
                                       HTMLInputElement* aRadio) {
   if (aRadio->IsRequired()) {
-    uint32_t& value = mRequiredRadioButtonCounts.GetOrInsert(aName, 0);
+    uint32_t& value = mRequiredRadioButtonCounts.LookupOrInsert(aName, 0);
     ++value;
   }
 }

diff --git a/dom/indexedDB/ActorsParent.cpp b/dom/indexedDB/ActorsParent.cpp
@@ -7628,11 +7628,11 @@ nsresult DatabaseConnection::UpdateRefcountFunction::ProcessValue(
 
     const auto entry =
         WrapNotNull(mFileInfoEntries
-                        .GetOrInsertWith(id,
-                                         [&file] {
-                                           return MakeUnique<FileInfoEntry>(
-                                               file.FileInfoPtr());
-                                         })
+                        .LookupOrInsertWith(id,
+                                            [&file] {
+                                              return MakeUnique<FileInfoEntry>(
+                                                  file.FileInfoPtr());
+                                            })
                         .get());
 
     if (mInSavepoint) {
@@ -16776,7 +16776,7 @@ void OpenDatabaseOp::EnsureDatabaseActor() {
     info->mLiveDatabases.AppendElement(
         WrapNotNullUnchecked(mDatabase.unsafeGetRawPtr()));
   } else {
-    // XXX Maybe use GetOrInsertWith above, to avoid a second lookup here?
+    // XXX Maybe use LookupOrInsertWith above, to avoid a second lookup here?
     info = gLiveDatabaseHashtable
                ->Put(mDatabaseId,
                      MakeUnique<DatabaseActorInfo>(

diff --git a/dom/ipc/WindowGlobalParent.cpp b/dom/ipc/WindowGlobalParent.cpp
@@ -190,7 +190,7 @@ void WindowGlobalParent::OriginCounter::UpdateSiteOriginsFrom(
     aParent->DocumentPrincipal()->GetSiteOrigin(origin);
 
     if (aIncrease) {
-      int32_t& count = mOriginMap.GetOrInsert(origin);
+      int32_t& count = mOriginMap.LookupOrInsert(origin);
       count += 1;
       mMaxOrigins = std::max(mMaxOrigins, mOriginMap.Count());
     } else if (auto entry = mOriginMap.Lookup(origin)) {

diff --git a/dom/localstorage/ActorsParent.cpp b/dom/localstorage/ActorsParent.cpp
@@ -3228,7 +3228,7 @@ bool RecvPBackgroundLSObserverConstructor(PBackgroundLSObserverParent* aActor,
 
   nsTArray<NotNull<Observer*>>* const array =
       gObservers
-          ->GetOrInsertWith(
+          ->LookupOrInsertWith(
               notNullObserver->Origin(),
               [] { return MakeUnique<nsTArray<NotNull<Observer*>>>(); })
           .get();
@@ -5451,7 +5451,7 @@ void Snapshot::SaveItem(const nsAString& aKey, const LSValue& aOldValue,
   }
 
   if (!mLoadedItems.GetEntry(aKey) && !mUnknownItems.GetEntry(aKey)) {
-    Unused << mValues.GetOrInsert(aKey, aOldValue);
+    mValues.LookupOrInsert(aKey, aOldValue);
   }
 
   if (aAffectsOrder && !mSavedKeys) {

diff --git a/dom/media/MediaManager.cpp b/dom/media/MediaManager.cpp
@@ -2793,7 +2793,7 @@ RefPtr<MediaManager::StreamPromise> MediaManager::GetUserMedia(
             // things down
             nsTArray<nsString>* const array =
                 self->mCallIds
-                    .GetOrInsertWith(
+                    .LookupOrInsertWith(
                         windowID,
                         [] { return MakeUnique<nsTArray<nsString>>(); })
                     .get();

diff --git a/dom/media/MediaTrackGraph.cpp b/dom/media/MediaTrackGraph.cpp
@@ -634,7 +634,7 @@ void MediaTrackGraphImpl::OpenAudioInputImpl(CubebUtils::AudioDeviceID aID,
   // Only allow one device per MTG (hence, per document), but allow opening a
   // device multiple times
   nsTArray<RefPtr<AudioDataListener>>& listeners =
-      mInputDeviceUsers.GetOrInsert(aID);
+      mInputDeviceUsers.LookupOrInsert(aID);
   if (listeners.IsEmpty() && mInputDeviceUsers.Count() > 1) {
     // We don't support opening multiple input device in a graph for now.
     listeners.RemoveElement(aID);

diff --git a/dom/media/gmp/GMPMemoryStorage.cpp b/dom/media/gmp/GMPMemoryStorage.cpp
@@ -13,10 +13,10 @@ class GMPMemoryStorage : public GMPStorage {
   GMPErr Open(const nsCString& aRecordName) override {
     MOZ_ASSERT(!IsOpen(aRecordName));
 
-    Record* record =
-        mRecords
-            .GetOrInsertWith(aRecordName, [] { return MakeUnique<Record>(); })
-            .get();
+    Record* record = mRecords
+                         .LookupOrInsertWith(
+                             aRecordName, [] { return MakeUnique<Record>(); })
+                         .get();
     record->mIsOpen = true;
     return GMPNoErr;
   }

diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp
@@ -1712,7 +1712,7 @@ bool SkeletonState::DecodeFisbone(ogg_packet* aPacket) {
 
           if ((i == 0 && IsAscii(strMsg)) || (i != 0 && IsUtf8(strMsg))) {
             EMsgHeaderType eHeaderType = kFieldTypeMaps[i].mMsgHeaderType;
-            Unused << field->mValuesStore.GetOrInsertWith(
+            Unused << field->mValuesStore.LookupOrInsertWith(
                 eHeaderType, [i, msgHead, msgProbe]() {
                   uint32_t nameLen =
                       strlen(kFieldTypeMaps[i].mPatternToRecognize);

diff --git a/dom/payments/PaymentRequestManager.cpp b/dom/payments/PaymentRequestManager.cpp
@@ -380,7 +380,7 @@ nsresult PaymentRequestManager::SendRequestPayment(
   }
 
   if (aResponseExpected) {
-    ++mActivePayments.GetOrInsert(aRequest, 0);
+    ++mActivePayments.LookupOrInsert(aRequest, 0);
   }
   return NS_OK;
 }