Bug 1634281 - Use nsTHashMap instead of nsDataHashtable. r=xpcom-reviewers,necko-reviewers,jgilbert,nika,valentin

Note that this patch only transforms the use of the nsDataHashtable type alias
to a directly equivalent use of nsTHashMap. It does not change the specification
of the hash key type to make use of the key class deduction that nsTHashMap
allows for in some cases. That can be done in a separate step, but requires more
attention.

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

Author: sigiesec

accessible/android/DocAccessibleWrap.h

@@ -47,7 +47,7 @@ class DocAccessibleWrap : public DocAccessible {
   /*
    * This provides a mapping from 32 bit id to accessible objects.
    */
-  nsDataHashtable<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
+  nsTHashMap<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
 
   virtual void DoInitialUpdate() override;
 

accessible/android/RemoteAccessibleWrap.h

@@ -145,7 +145,7 @@ class DocRemoteAccessibleWrap : public RemoteAccessibleWrap {
   /*
    * This provides a mapping from 32 bit id to accessible objects.
    */
-  nsDataHashtable<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
+  nsTHashMap<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
 };
 }  // namespace a11y
 }  // namespace mozilla

accessible/aom/AccessibleNode.h

@@ -7,7 +7,7 @@
 #ifndef A11Y_AOM_ACCESSIBLENODE_H
 #define A11Y_AOM_ACCESSIBLENODE_H
 
-#include "nsDataHashtable.h"
+#include "nsTHashMap.h"
 #include "nsRefPtrHashtable.h"
 #include "nsWrapperCache.h"
 #include "mozilla/dom/BindingDeclarations.h"
@@ -76,7 +76,7 @@ struct ParentObject;
   MOZ_FOR_EACH(ANODE_RELATION_FUNC, (), (__VA_ARGS__))
 
 #define ANODE_ACCESSOR_MUTATOR(typeName, type, defVal)                      \
-  nsDataHashtable<nsUint32HashKey, type> m##typeName##Properties;           \
+  nsTHashMap<nsUint32HashKey, type> m##typeName##Properties;                \
                                                                             \
   dom::Nullable<type> GetProperty(AOM##typeName##Property aProperty) {      \
     type value = defVal;                                                    \
@@ -199,7 +199,7 @@ class AccessibleNode : public nsISupports, public nsWrapperCache {
   // not(0) and 2k+1'th bit contains the property's value(1:true, 0:false)
   uint32_t mBooleanProperties;
   nsRefPtrHashtable<nsUint32HashKey, AccessibleNode> mRelationProperties;
-  nsDataHashtable<nsUint32HashKey, nsString> mStringProperties;
+  nsTHashMap<nsUint32HashKey, nsString> mStringProperties;
 
   RefPtr<a11y::LocalAccessible> mIntl;
   RefPtr<nsINode> mDOMNode;

accessible/base/NotificationController.cpp

@@ -522,8 +522,7 @@ void NotificationController::ProcessMutationEvents() {
   }
 
   // Group the show events by the parent of their target.
-  nsDataHashtable<nsPtrHashKey<LocalAccessible>,
-                  nsTArray<AccTreeMutationEvent*>>
+  nsTHashMap<nsPtrHashKey<LocalAccessible>, nsTArray<AccTreeMutationEvent*>>
       showEvents;
   for (AccTreeMutationEvent* event = mFirstMutationEvent; event;
        event = event->NextEvent()) {

accessible/base/nsAccessibilityService.h

@@ -363,12 +363,11 @@ class nsAccessibilityService final : public mozilla::a11y::DocManager,
    */
   static uint32_t gConsumers;
 
-  nsDataHashtable<nsPtrHashKey<const nsAtom>,
-                  const mozilla::a11y::HTMLMarkupMapInfo*>
+  nsTHashMap<nsPtrHashKey<const nsAtom>,
+             const mozilla::a11y::HTMLMarkupMapInfo*>
       mHTMLMarkupMap;
 #ifdef MOZ_XUL
-  nsDataHashtable<nsPtrHashKey<const nsAtom>,
-                  const mozilla::a11y::XULMarkupMapInfo*>
+  nsTHashMap<nsPtrHashKey<const nsAtom>, const mozilla::a11y::XULMarkupMapInfo*>
       mXULMarkupMap;
 #endif
 

accessible/generic/DocAccessible.h

@@ -12,7 +12,7 @@
 #include "AccEvent.h"
 
 #include "nsClassHashtable.h"
-#include "nsDataHashtable.h"
+#include "nsTHashMap.h"
 #include "mozilla/UniquePtr.h"
 #include "nsIDocumentObserver.h"
 #include "nsIObserver.h"
@@ -606,12 +606,12 @@ class DocAccessible : public HyperTextAccessibleWrap,
    * Cache of accessibles within this document accessible.
    */
   AccessibleHashtable mAccessibleCache;
-  nsDataHashtable<nsPtrHashKey<const nsINode>, LocalAccessible*>
+  nsTHashMap<nsPtrHashKey<const nsINode>, LocalAccessible*>
       mNodeToAccessibleMap;
 
   Document* mDocumentNode;
   nsCOMPtr<nsITimer> mScrollWatchTimer;
-  nsDataHashtable<nsPtrHashKey<nsINode>, TimeStamp> mLastScrollingDispatch;
+  nsTHashMap<nsPtrHashKey<nsINode>, TimeStamp> mLastScrollingDispatch;
 
   /**
    * Bit mask of document load states (@see LoadState).

accessible/ipc/DocAccessibleParent.h

@@ -336,8 +336,8 @@ class DocAccessibleParent : public RemoteAccessible,
   nsTArray<PendingChildDoc> mPendingChildDocs;
 
   static uint64_t sMaxDocID;
-  static nsDataHashtable<nsUint64HashKey, DocAccessibleParent*>& LiveDocs() {
-    static nsDataHashtable<nsUint64HashKey, DocAccessibleParent*> sLiveDocs;
+  static nsTHashMap<nsUint64HashKey, DocAccessibleParent*>& LiveDocs() {
+    static nsTHashMap<nsUint64HashKey, DocAccessibleParent*> sLiveDocs;
     return sLiveDocs;
   }
 };

accessible/mac/MOXTextMarkerDelegate.mm

@@ -15,7 +15,7 @@
 
 #define PREF_ACCESSIBILITY_MAC_DEBUG "accessibility.mac.debug"
 
-static nsDataHashtable<nsUint64HashKey, MOXTextMarkerDelegate*> sDelegates;
+static nsTHashMap<nsUint64HashKey, MOXTextMarkerDelegate*> sDelegates;
 
 @implementation MOXTextMarkerDelegate
 

accessible/windows/ProxyWrappers.h

@@ -76,7 +76,7 @@ class DocRemoteAccessibleWrap : public HyperTextRemoteAccessibleWrap {
   /*
    * This provides a mapping from 32 bit id to accessible objects.
    */
-  nsDataHashtable<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
+  nsTHashMap<nsUint32HashKey, AccessibleWrap*> mIDToAccessibleMap;
 };
 
 template <typename T>

accessible/windows/msaa/CompatibilityUIA.cpp

@@ -11,7 +11,7 @@
 #include "mozilla/UniquePtrExtensions.h"
 #include "mozilla/WindowsVersion.h"
 
-#include "nsDataHashtable.h"
+#include "nsTHashMap.h"
 #include "nsPrintfCString.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
@@ -225,7 +225,7 @@ Maybe<bool> Compatibility::OnUIAMessage(WPARAM aWParam, LPARAM aLParam) {
   Maybe<PVOID> kernelObject;
   static Maybe<USHORT> sectionObjTypeIndex;
   nsTHashtable<nsUint32HashKey> nonSectionObjTypes;
-  nsDataHashtable<nsVoidPtrHashKey, DWORD> objMap;
+  nsTHashMap<nsVoidPtrHashKey, DWORD> objMap;
 
   auto handleInfo =
       reinterpret_cast<SYSTEM_HANDLE_INFORMATION_EX*>(handleInfoBuf.get());