nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

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

Browse source 
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
This commit is contained in:
Simon Giesecke 2021-03-10 10:47:47 +00:00
parent 943f2f5041
commit ad01a10a3b
209 changed files with 456 additions and 485 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
accessible/android/DocAccessibleWrap.h
View file

@ -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;

2
accessible/android/RemoteAccessibleWrap.h
View file

@ -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

6
accessible/aom/AccessibleNode.h
View file

@ -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;

3
accessible/base/NotificationController.cpp
View file

@ -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()) {

7
accessible/base/nsAccessibilityService.h
View file

@ -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

6
accessible/generic/DocAccessible.h
View file

@ -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).

4
accessible/ipc/DocAccessibleParent.h
View file

@ -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;
}
};

2
accessible/mac/MOXTextMarkerDelegate.mm
View file

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

2
accessible/windows/ProxyWrappers.h
View file

@ -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>

4
accessible/windows/msaa/CompatibilityUIA.cpp
View file

@ -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());

2
accessible/windows/msaa/DocAccessibleWrap.h
View file

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

4
accessible/windows/msaa/MsaaIdGenerator.cpp
View file

@ -13,7 +13,7 @@
#include "mozilla/dom/ContentChild.h"
#include "mozilla/StaticPtr.h"
#include "mozilla/Unused.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "sdnAccessible.h"
// These constants may be adjusted to modify the proportion of the Child ID
@ -35,7 +35,7 @@ namespace mozilla {
namespace a11y {
namespace detail {
typedef nsDataHashtable<nsUint64HashKey, uint32_t> ContentParentIdMap;
typedef nsTHashMap<nsUint64HashKey, uint32_t> ContentParentIdMap;
#pragma pack(push, 1)
union MsaaID {

2
accessible/xpcom/xpcAccessibleDocument.h
View file

@ -93,7 +93,7 @@ class xpcAccessibleDocument : public xpcAccessibleHyperText,
xpcAccessibleDocument(const xpcAccessibleDocument&) = delete;
xpcAccessibleDocument& operator=(const xpcAccessibleDocument&) = delete;
nsDataHashtable<nsPtrHashKey<const void>, xpcAccessibleGeneric*> mCache;
nsTHashMap<nsPtrHashKey<const void>, xpcAccessibleGeneric*> mCache;
bool mRemote;
};

2
docshell/base/BaseHistory.h
View file

@ -59,7 +59,7 @@ class BaseHistory : public IHistory {
protected:
// A map from URI to links that depend on that URI, and whether that URI is
// known-to-be-visited-or-unvisited already.
nsDataHashtable<nsURIHashKey, ObservingLinks> mTrackedURIs;
nsTHashMap<nsURIHashKey, ObservingLinks> mTrackedURIs;
private:
// The set of pending URIs that we haven't queried yet but need to.

2
docshell/base/BrowsingContext.cpp
View file

@ -134,7 +134,7 @@ extern mozilla::LazyLogModule gUserInteractionPRLog;
static LazyLogModule gBrowsingContextLog("BrowsingContext");
static LazyLogModule gBrowsingContextSyncLog("BrowsingContextSync");
typedef nsDataHashtable<nsUint64HashKey, BrowsingContext*> BrowsingContextMap;
typedef nsTHashMap<nsUint64HashKey, BrowsingContext*> BrowsingContextMap;
// All BrowsingContexts indexed by Id
static StaticAutoPtr<BrowsingContextMap> sBrowsingContexts;

6
docshell/base/ChildProcessChannelListener.h
View file

@ -12,7 +12,7 @@
#include "mozilla/extensions/StreamFilterParent.h"
#include "mozilla/net/NeckoChannelParams.h"
#include "nsDOMNavigationTiming.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsIChannel.h"
#include "BackgroundUtils.h"
@ -46,8 +46,8 @@ class ChildProcessChannelListener final {
};
// TODO Backtrack.
nsDataHashtable<nsUint64HashKey, Callback> mCallbacks;
nsDataHashtable<nsUint64HashKey, CallbackArgs> mChannelArgs;
nsTHashMap<nsUint64HashKey, Callback> mCallbacks;
nsTHashMap<nsUint64HashKey, CallbackArgs> mChannelArgs;
};
} // namespace dom

2
docshell/base/WindowContext.cpp
View file

@ -36,7 +36,7 @@ extern mozilla::LazyLogModule gUserInteractionPRLog;
#define USER_ACTIVATION_LOG(msg, ...) \
MOZ_LOG(gUserInteractionPRLog, LogLevel::Debug, (msg, ##__VA_ARGS__))
using WindowContextByIdMap = nsDataHashtable<nsUint64HashKey, WindowContext*>;
using WindowContextByIdMap = nsTHashMap<nsUint64HashKey, WindowContext*>;
static StaticAutoPtr<WindowContextByIdMap> gWindowContexts;
/* static */

5
docshell/shistory/SessionHistoryEntry.cpp
View file

@ -332,7 +332,7 @@ void SessionHistoryInfo::SharedState::Init(
static uint64_t gLoadingSessionHistoryInfoLoadId = 0;
nsDataHashtable<nsUint64HashKey, SessionHistoryEntry*>*
nsTHashMap<nsUint64HashKey, SessionHistoryEntry*>*
SessionHistoryEntry::sLoadIdToEntry = nullptr;
LoadingSessionHistoryInfo::LoadingSessionHistoryInfo(
@ -374,8 +374,7 @@ SessionHistoryEntry* SessionHistoryEntry::GetByLoadId(uint64_t aLoadId) {
void SessionHistoryEntry::SetByLoadId(uint64_t aLoadId,
SessionHistoryEntry* aEntry) {
if (!sLoadIdToEntry) {
sLoadIdToEntry =
new nsDataHashtable<nsUint64HashKey, SessionHistoryEntry*>();
sLoadIdToEntry = new nsTHashMap<nsUint64HashKey, SessionHistoryEntry*>();
}
MOZ_LOG(

4
docshell/shistory/SessionHistoryEntry.h
View file

@ -12,7 +12,7 @@
#include "nsISHEntry.h"
#include "nsSHEntryShared.h"
#include "nsStructuredCloneContainer.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
class nsDocShellLoadState;
class nsIChannel;
@ -395,7 +395,7 @@ class SessionHistoryEntry : public nsISHEntry {
HistoryEntryCounterForBrowsingContext mBCHistoryLength;
static nsDataHashtable<nsUint64HashKey, SessionHistoryEntry*>* sLoadIdToEntry;
static nsTHashMap<nsUint64HashKey, SessionHistoryEntry*>* sLoadIdToEntry;
};
NS_DEFINE_STATIC_IID_ACCESSOR(SessionHistoryEntry, NS_SESSIONHISTORYENTRY_IID)

4
docshell/shistory/nsSHEntryShared.cpp
View file

@ -24,7 +24,7 @@ namespace dom = mozilla::dom;
namespace {
uint64_t gSHEntrySharedID = 0;
nsDataHashtable<nsUint64HashKey, mozilla::dom::SHEntrySharedParentState*>*
nsTHashMap<nsUint64HashKey, mozilla::dom::SHEntrySharedParentState*>*
sIdToSharedState = nullptr;
} // namespace
@ -49,7 +49,7 @@ static void AddSHEntrySharedParentState(
if (!sIdToSharedState) {
sIdToSharedState =
new nsDataHashtable<nsUint64HashKey, SHEntrySharedParentState*>();
new nsTHashMap<nsUint64HashKey, SHEntrySharedParentState*>();
}
sIdToSharedState->InsertOrUpdate(aSharedState->mId, aSharedState);
}

12
docshell/shistory/nsSHistory.cpp
View file

@ -25,7 +25,7 @@
#include "nsIURI.h"
#include "nsIXULRuntime.h"
#include "nsNetUtil.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsSHEntry.h"
#include "SessionHistoryEntry.h"
#include "nsTArray.h"
@ -994,7 +994,7 @@ void nsSHistory::WindowIndices(int32_t aIndex, int32_t* aOutStartIndex,
static void MarkAsInitialEntry(
SessionHistoryEntry* aEntry,
nsDataHashtable<nsIDHashKey, SessionHistoryEntry*>& aHashtable) {
nsTHashMap<nsIDHashKey, SessionHistoryEntry*>& aHashtable) {
if (!aEntry->BCHistoryLength().Modified()) {
++(aEntry->BCHistoryLength());
}
@ -1030,7 +1030,7 @@ nsSHistory::PurgeHistory(int32_t aNumEntries) {
// Set all the entries hanging of the first entry that we keep
// (mEntries[aNumEntries]) as being created as the result of a load
// (so contributing one to their BCHistoryLength).
nsDataHashtable<nsIDHashKey, SessionHistoryEntry*> docshellIDToEntry;
nsTHashMap<nsIDHashKey, SessionHistoryEntry*> docshellIDToEntry;
if (aNumEntries != Length()) {
nsCOMPtr<SessionHistoryEntry> she =
do_QueryInterface(mEntries[aNumEntries]);
@ -2206,7 +2206,7 @@ nsSHistory::IsEmptyOrHasEntriesForSingleTopLevelPage() {
}
static void CollectEntries(
nsDataHashtable<nsIDHashKey, SessionHistoryEntry*>& aHashtable,
nsTHashMap<nsIDHashKey, SessionHistoryEntry*>& aHashtable,
SessionHistoryEntry* aEntry) {
aHashtable.InsertOrUpdate(aEntry->DocshellID(), aEntry);
for (const RefPtr<SessionHistoryEntry>& entry : aEntry->Children()) {
@ -2217,7 +2217,7 @@ static void CollectEntries(
}
static void UpdateEntryLength(
nsDataHashtable<nsIDHashKey, SessionHistoryEntry*>& aHashtable,
nsTHashMap<nsIDHashKey, SessionHistoryEntry*>& aHashtable,
SessionHistoryEntry* aNewEntry, bool aMove) {
SessionHistoryEntry* oldEntry = aHashtable.Get(aNewEntry->DocshellID());
if (oldEntry) {
@ -2256,7 +2256,7 @@ void nsSHistory::UpdateEntryLength(nsISHEntry* aOldEntry, nsISHEntry* aNewEntry,
return;
}
nsDataHashtable<nsIDHashKey, SessionHistoryEntry*> docshellIDToEntry;
nsTHashMap<nsIDHashKey, SessionHistoryEntry*> docshellIDToEntry;
CollectEntries(docshellIDToEntry, oldSHE);
::UpdateEntryLength(docshellIDToEntry, newSHE, aMove);

2
dom/animation/EffectCompositor.cpp
View file

@ -836,7 +836,7 @@ bool EffectCompositor::PreTraverseInSubtree(ServoTraversalFlags aFlags,
(aFlags & ServoTraversalFlags::FlushThrottledAnimations);
using ElementsToRestyleIterType =
nsDataHashtable<PseudoElementHashEntry, bool>::Iterator;
nsTHashMap<PseudoElementHashEntry, bool>::Iterator;
auto getNeededRestyleTarget =
[&](const ElementsToRestyleIterType& aIter) -> NonOwningAnimationTarget {
NonOwningAnimationTarget returnTarget;

4
dom/animation/EffectCompositor.h
View file

@ -18,7 +18,7 @@
#include "mozilla/ServoTypes.h"
#include "nsCSSPropertyID.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsTArray.h"
class nsCSSPropertyIDSet;
@ -254,7 +254,7 @@ class EffectCompositor {
// indicate that the style rule on the element is out of date but without
// posting a restyle to update it.
EnumeratedArray<CascadeLevel, CascadeLevel(kCascadeLevelCount),
nsDataHashtable<PseudoElementHashEntry, bool>>
nsTHashMap<PseudoElementHashEntry, bool>>
mElementsToRestyle;
bool mIsInPreTraverse = false;

8
dom/base/Document.h
View file

@ -58,7 +58,7 @@
#include "nsCompatibility.h"
#include "nsContentListDeclarations.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsExpirationTracker.h"
#include "nsGkAtoms.h"
@ -1623,7 +1623,7 @@ class Document : public nsINode,
class SelectorCache final : public nsExpirationTracker<SelectorCacheKey, 4> {
public:
using SelectorList = UniquePtr<RawServoSelectorList>;
using Table = nsDataHashtable<nsCStringHashKey, SelectorList>;
using Table = nsTHashMap<nsCStringHashKey, SelectorList>;
explicit SelectorCache(nsIEventTarget* aEventTarget);
void NotifyExpired(SelectorCacheKey*) final;
@ -4220,7 +4220,7 @@ class Document : public nsINode,
};
// Mapping table from HTML command name to internal command.
typedef nsDataHashtable<nsStringCaseInsensitiveHashKey, InternalCommandData>
typedef nsTHashMap<nsStringCaseInsensitiveHashKey, InternalCommandData>
InternalCommandDataHashtable;
static InternalCommandDataHashtable* sInternalCommandDataHashtable;
@ -4839,7 +4839,7 @@ class Document : public nsINode,
// A list of preconnects initiated by the preloader. This prevents
// the same uri from being used more than once, and allows the dom
// builder to not repeat the work of the preloader.
nsDataHashtable<nsURIHashKey, bool> mPreloadedPreconnects;
nsTHashMap<nsURIHashKey, bool> mPreloadedPreconnects;
// Current depth of picture elements from parser
uint32_t mPreloadPictureDepth;

4
dom/base/Element.h
View file

@ -45,7 +45,7 @@
#include "nsAttrValueInlines.h"
#include "nsCaseTreatment.h"
#include "nsChangeHint.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsError.h"
#include "nsGkAtoms.h"
@ -132,7 +132,7 @@ template <typename T>
class Optional;
enum class CallerType : uint32_t;
enum class ReferrerPolicy : uint8_t;
typedef nsDataHashtable<nsRefPtrHashKey<DOMIntersectionObserver>, int32_t>
typedef nsTHashMap<nsRefPtrHashKey<DOMIntersectionObserver>, int32_t>
IntersectionObserverList;
} // namespace dom
} // namespace mozilla

4
dom/base/ImageTracker.h
View file

@ -10,7 +10,7 @@
#ifndef mozilla_dom_ImageTracker
#define mozilla_dom_ImageTracker
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
class imgIRequest;
@ -61,7 +61,7 @@ class ImageTracker {
private:
~ImageTracker();
nsDataHashtable<nsPtrHashKey<imgIRequest>, uint32_t> mImages;
nsTHashMap<nsPtrHashKey<imgIRequest>, uint32_t> mImages;
bool mLocking;
bool mAnimating;
};

4
dom/base/MimeType.h
View file

@ -9,7 +9,7 @@
#include "mozilla/TextUtils.h"
#include "mozilla/UniquePtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsTArray.h"
template <typename char_type>
@ -35,7 +35,7 @@ class TMimeType final {
nsTString<char_type> mType;
nsTString<char_type> mSubtype;
nsDataHashtable<typename HashKeyType<char_type>::HashType, ParameterValue>
nsTHashMap<typename HashKeyType<char_type>::HashType, ParameterValue>
mParameters;
nsTArray<nsTString<char_type>> mParameterNames;

4
dom/base/Timeout.h
View file

@ -13,7 +13,7 @@
#include "mozilla/TimeStamp.h"
#include "nsGlobalWindowInner.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#ifdef MOZ_GECKO_PROFILER
# include "mozilla/ProfileChunkedBuffer.h"
@ -70,7 +70,7 @@ class Timeout final : protected LinkedListElement<RefPtr<Timeout>> {
const TimeoutIdAndReason mValue;
};
class TimeoutSet : public nsDataHashtable<TimeoutHashKey, Timeout*> {
class TimeoutSet : public nsTHashMap<TimeoutHashKey, Timeout*> {
public:
NS_INLINE_DECL_REFCOUNTING(TimeoutSet);

13
dom/base/nsContentUtils.cpp
View file

@ -235,7 +235,7 @@
#include "nsCycleCollectionNoteChild.h"
#include "nsDOMMutationObserver.h"
#include "nsDOMString.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsDocShell.h"
#include "nsDocShellCID.h"
@ -422,9 +422,9 @@ nsNameSpaceManager* nsContentUtils::sNameSpaceManager;
nsIIOService* nsContentUtils::sIOService;
nsIUUIDGenerator* nsContentUtils::sUUIDGenerator;
nsIConsoleService* nsContentUtils::sConsoleService;
nsDataHashtable<nsRefPtrHashKey<nsAtom>, EventNameMapping>*
nsTHashMap<nsRefPtrHashKey<nsAtom>, EventNameMapping>*
nsContentUtils::sAtomEventTable = nullptr;
nsDataHashtable<nsStringHashKey, EventNameMapping>*
nsTHashMap<nsStringHashKey, EventNameMapping>*
nsContentUtils::sStringEventTable = nullptr;
nsTArray<RefPtr<nsAtom>>* nsContentUtils::sUserDefinedEvents = nullptr;
nsIStringBundleService* nsContentUtils::sStringBundleService;
@ -956,10 +956,9 @@ bool nsContentUtils::InitializeEventTable() {
#undef EVENT
{nullptr}};
sAtomEventTable =
new nsDataHashtable<nsRefPtrHashKey<nsAtom>, EventNameMapping>(
ArrayLength(eventArray));
sStringEventTable = new nsDataHashtable<nsStringHashKey, EventNameMapping>(
sAtomEventTable = new nsTHashMap<nsRefPtrHashKey<nsAtom>, EventNameMapping>(
ArrayLength(eventArray));
sStringEventTable = new nsTHashMap<nsStringHashKey, EventNameMapping>(
ArrayLength(eventArray));
sUserDefinedEvents = new nsTArray<RefPtr<nsAtom>>(64);

5
dom/base/nsContentUtils.h
View file

@ -3356,9 +3356,8 @@ class nsContentUtils {
static nsIConsoleService* sConsoleService;
static nsDataHashtable<nsRefPtrHashKey<nsAtom>, EventNameMapping>*
sAtomEventTable;
static nsDataHashtable<nsStringHashKey, EventNameMapping>* sStringEventTable;
static nsTHashMap<nsRefPtrHashKey<nsAtom>, EventNameMapping>* sAtomEventTable;
static nsTHashMap<nsStringHashKey, EventNameMapping>* sStringEventTable;
static nsTArray<RefPtr<nsAtom>>* sUserDefinedEvents;
static nsIStringBundleService* sStringBundleService;

4
dom/base/nsDOMTokenList.cpp
View file

@ -11,7 +11,7 @@
#include "nsDOMTokenList.h"
#include "nsAttrValue.h"
#include "nsAttrValueInlines.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsError.h"
#include "nsHashKeys.h"
#include "mozilla/dom/Document.h"
@ -54,7 +54,7 @@ const nsAttrValue* nsDOMTokenList::GetParsedAttr() {
}
static void RemoveDuplicatesInternal(AtomArray* aArray, uint32_t aStart) {
nsDataHashtable<nsPtrHashKey<nsAtom>, bool> tokens;
nsTHashMap<nsPtrHashKey<nsAtom>, bool> tokens;
for (uint32_t i = 0; i < aArray->Length(); i++) {
nsAtom* atom = aArray->ElementAt(i);

8
dom/base/nsFrameMessageManager.cpp
View file

@ -69,7 +69,7 @@
#include "nsContentUtils.h"
#include "nsCycleCollectionNoteChild.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsError.h"
#include "nsFrameMessageManager.h"
@ -972,7 +972,7 @@ struct MessageManagerReferentCount {
size_t mWeakAlive;
size_t mWeakDead;
nsTArray<nsString> mSuspectMessages;
nsDataHashtable<nsStringHashKey, uint32_t> mMessageCounter;
nsTHashMap<nsStringHashKey, uint32_t> mMessageCounter;
};
} // namespace
@ -1130,7 +1130,7 @@ nsresult NS_NewGlobalMessageManager(nsISupports** aResult) {
return NS_OK;
}
nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>*
nsTHashMap<nsStringHashKey, nsMessageManagerScriptHolder*>*
nsMessageManagerScriptExecutor::sCachedScripts = nullptr;
StaticRefPtr<nsScriptCacheCleaner>
nsMessageManagerScriptExecutor::sScriptCacheCleaner;
@ -1138,7 +1138,7 @@ StaticRefPtr<nsScriptCacheCleaner>
void nsMessageManagerScriptExecutor::DidCreateScriptLoader() {
if (!sCachedScripts) {
sCachedScripts =
new nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>;
new nsTHashMap<nsStringHashKey, nsMessageManagerScriptHolder*>;
sScriptCacheCleaner = new nsScriptCacheCleaner();
}
}

4
dom/base/nsFrameMessageManager.h
View file

@ -25,7 +25,7 @@
#include "nsCOMPtr.h"
#include "nsClassHashtable.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsIMessageManager.h"
#include "nsIObserver.h"
@ -349,7 +349,7 @@ class nsMessageManagerScriptExecutor {
// optimize their script loading to avoid unnecessary duplication.
virtual bool IsProcessScoped() const { return false; }
static nsDataHashtable<nsStringHashKey, nsMessageManagerScriptHolder*>*
static nsTHashMap<nsStringHashKey, nsMessageManagerScriptHolder*>*
sCachedScripts;
static mozilla::StaticRefPtr<nsScriptCacheCleaner> sScriptCacheCleaner;
};

4
dom/base/nsGlobalWindowInner.h
View file

@ -17,7 +17,7 @@
// Helper Classes
#include "nsCOMPtr.h"
#include "nsWeakReference.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsCycleCollectionParticipant.h"
// Interfaces Needed
@ -189,7 +189,7 @@ class nsGlobalWindowInner final : public mozilla::dom::EventTarget,
typedef mozilla::TimeStamp TimeStamp;
typedef mozilla::TimeDuration TimeDuration;
typedef nsDataHashtable<nsUint64HashKey, nsGlobalWindowInner*>
typedef nsTHashMap<nsUint64HashKey, nsGlobalWindowInner*>
InnerWindowByIdTable;
static void AssertIsOnMainThread()

4
dom/base/nsGlobalWindowOuter.h
View file

@ -18,7 +18,7 @@
// Helper Classes
#include "nsCOMPtr.h"
#include "nsWeakReference.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsCycleCollectionParticipant.h"
// Interfaces Needed
@ -165,7 +165,7 @@ class nsGlobalWindowOuter final : public mozilla::dom::EventTarget,
public nsIInterfaceRequestor,
public PRCListStr {
public:
typedef nsDataHashtable<nsUint64HashKey, nsGlobalWindowOuter*>
typedef nsTHashMap<nsUint64HashKey, nsGlobalWindowOuter*>
OuterWindowByIdTable;
using PrintPreviewResolver =

6
dom/base/nsNameSpaceManager.h
View file

@ -7,7 +7,7 @@
#ifndef nsNameSpaceManager_h___
#define nsNameSpaceManager_h___
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsAtom.h"
#include "nsStringFwd.h"
@ -74,8 +74,8 @@ class nsNameSpaceManager final {
const int32_t aNameSpaceID);
~nsNameSpaceManager() = default;
nsDataHashtable<nsRefPtrHashKey<nsAtom>, int32_t> mURIToIDTable;
nsDataHashtable<nsRefPtrHashKey<nsAtom>, int32_t> mDisabledURIToIDTable;
nsTHashMap<nsRefPtrHashKey<nsAtom>, int32_t> mURIToIDTable;
nsTHashMap<nsRefPtrHashKey<nsAtom>, int32_t> mDisabledURIToIDTable;
nsTArray<RefPtr<nsAtom>> mURIArray;
static mozilla::StaticRefPtr<nsNameSpaceManager> sInstance;

4
dom/base/nsNodeInfoManager.h
View file

@ -17,7 +17,7 @@
#include "mozilla/MruCache.h"
#include "nsCOMPtr.h" // for member
#include "nsCycleCollectionParticipant.h" // for NS_DECL_CYCLE_*
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsStringFwd.h"
class nsAtom;
@ -160,7 +160,7 @@ class nsNodeInfoManager final {
}
};
nsDataHashtable<NodeInfoInnerKey, mozilla::dom::NodeInfo*> mNodeInfoHash;
nsTHashMap<NodeInfoInnerKey, mozilla::dom::NodeInfo*> mNodeInfoHash;
mozilla::dom::Document* MOZ_NON_OWNING_REF mDocument; // WEAK
uint32_t mNonDocumentNodeInfos;
nsCOMPtr<nsIPrincipal> mPrincipal; // Never null after Init() succeeds.

2
dom/base/nsWindowMemoryReporter.cpp
View file

@ -169,7 +169,7 @@ static void AppendWindowURI(nsGlobalWindowInner* aWindow, nsACString& aStr,
MOZ_DEFINE_MALLOC_SIZE_OF(WindowsMallocSizeOf)
// The key is the window ID.
typedef nsDataHashtable<nsUint64HashKey, nsCString> WindowPaths;
typedef nsTHashMap<nsUint64HashKey, nsCString> WindowPaths;
static void ReportAmount(const nsCString& aBasePath, const char* aPathTail,
size_t aAmount, const nsCString& aDescription,

4
dom/base/nsWindowMemoryReporter.h
View file

@ -11,7 +11,7 @@
#include "nsIMemoryReporter.h"
#include "nsIObserver.h"
#include "nsITimer.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsWeakReference.h"
#include "mozilla/Attributes.h"
#include "mozilla/Assertions.h"
@ -158,7 +158,7 @@ class nsWindowMemoryReporter final : public nsIMemoryReporter,
* possible for a detached window to become non-detached, and we won't
* remove it from the table until CheckForGhostWindows runs.)
*/
nsDataHashtable<nsISupportsHashKey, mozilla::TimeStamp> mDetachedWindows;
nsTHashMap<nsISupportsHashKey, mozilla::TimeStamp> mDetachedWindows;
/**
* Track the last time we ran CheckForGhostWindows(), to avoid running it

6
dom/clients/manager/ClientManagerService.h
View file

@ -15,7 +15,7 @@
#include "mozilla/RefPtr.h"
#include "mozilla/dom/ClientIPCTypes.h"
#include "mozilla/dom/ipc/IdType.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsISupports.h"
#include "nsTArray.h"
@ -42,11 +42,11 @@ class ClientHandleParent;
class ClientManagerService final {
// Store the ClientSourceParent objects in a hash table. We want to
// optimize for insertion, removal, and lookup by UUID.
nsDataHashtable<nsIDHashKey, ClientSourceParent*> mSourceTable;
nsTHashMap<nsIDHashKey, ClientSourceParent*> mSourceTable;
// The set of handles waiting for their corresponding ClientSourceParent
// to be created.
nsDataHashtable<nsIDHashKey, nsTArray<ClientHandleParent*>> mPendingHandles;
nsTHashMap<nsIDHashKey, nsTArray<ClientHandleParent*>> mPendingHandles;
nsTArray<ClientManagerParent*> mManagerList;

6
dom/console/Console.h
View file

@ -11,7 +11,7 @@
#include "mozilla/dom/ConsoleBinding.h"
#include "mozilla/TimeStamp.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsIObserver.h"
#include "nsWeakReference.h"
@ -398,8 +398,8 @@ class Console final : public nsIObserver, public nsSupportsWeakReference {
nsCOMPtr<nsIGlobalObject> mGlobal;
// Touched on the owner thread.
nsDataHashtable<nsStringHashKey, DOMHighResTimeStamp> mTimerRegistry;
nsDataHashtable<nsStringHashKey, uint32_t> mCounterRegistry;
nsTHashMap<nsStringHashKey, DOMHighResTimeStamp> mTimerRegistry;
nsTHashMap<nsStringHashKey, uint32_t> mCounterRegistry;
nsTArray<RefPtr<ConsoleCallData>> mCallDataStorage;
// These are references to the arguments we received in each call

4
dom/events/PointerEventHandler.cpp
View file

@ -33,7 +33,7 @@ static nsClassHashtable<nsUint32HashKey, PointerInfo>* sActivePointersIds;
// Keeps track of which BrowserParent requested pointer capture for a pointer
// id.
static nsDataHashtable<nsUint32HashKey, BrowserParent*>*
static nsTHashMap<nsUint32HashKey, BrowserParent*>*
sPointerCaptureRemoteTargetTable = nullptr;
/* static */
@ -44,7 +44,7 @@ void PointerEventHandler::InitializeStatics() {
sActivePointersIds = new nsClassHashtable<nsUint32HashKey, PointerInfo>;
if (XRE_IsParentProcess()) {
sPointerCaptureRemoteTargetTable =
new nsDataHashtable<nsUint32HashKey, BrowserParent*>;
new nsTHashMap<nsUint32HashKey, BrowserParent*>;
}
}

2
dom/file/uri/BlobURLProtocolHandler.cpp
View file

@ -185,7 +185,7 @@ class BlobURLsReporter final : public nsIMemoryReporter {
return NS_OK;
}
nsDataHashtable<nsPtrHashKey<mozilla::dom::BlobImpl>, uint32_t> refCounts;
nsTHashMap<nsPtrHashKey<mozilla::dom::BlobImpl>, uint32_t> refCounts;
// Determine number of URLs per mozilla::dom::BlobImpl, to handle the case
// where it's > 1.

4
dom/gamepad/Gamepad.h
View file

@ -17,7 +17,7 @@
#include "mozilla/dom/Performance.h"
#include <stdint.h>
#include "nsCOMPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsString.h"
#include "nsTArray.h"
#include "nsWrapperCache.h"
@ -136,7 +136,7 @@ class Gamepad final : public nsISupports, public nsWrapperCache {
nsTArray<RefPtr<GamepadHapticActuator>> mHapticActuators;
nsTArray<RefPtr<GamepadLightIndicator>> mLightIndicators;
nsTArray<RefPtr<GamepadTouch>> mTouchEvents;
nsDataHashtable<nsUint32HashKey, uint32_t> mTouchIdHash;
nsTHashMap<nsUint32HashKey, uint32_t> mTouchIdHash;
};
} // namespace dom

7
dom/html/HTMLFormElement.h
View file

@ -21,7 +21,7 @@
#include "nsThreadUtils.h"
#include "nsInterfaceHashtable.h"
#include "nsRefPtrHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "js/friend/DOMProxy.h" // JS::ExpandoAndGeneration
class nsIMutableArray;
@ -553,11 +553,10 @@ class HTMLFormElement final : public nsGenericHTMLElement,
/** The currently selected radio button of each group */
nsRefPtrHashtable<nsStringHashKey, HTMLInputElement> mSelectedRadioButtons;
/** The number of required radio button of each group */
nsDataHashtable<nsStringCaseInsensitiveHashKey, uint32_t>
nsTHashMap<nsStringCaseInsensitiveHashKey, uint32_t>
mRequiredRadioButtonCounts;
/** The value missing state of each group */
nsDataHashtable<nsStringCaseInsensitiveHashKey, bool>
mValueMissingRadioGroups;
nsTHashMap<nsStringCaseInsensitiveHashKey, bool> mValueMissingRadioGroups;
/** The pending submission object */
UniquePtr<HTMLFormSubmission> mPendingSubmission;

16
dom/indexedDB/ActorsParent.cpp
View file

@ -151,7 +151,7 @@
#include "nsCOMPtr.h"
#include "nsClassHashtable.h"
#include "nsContentUtils.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsError.h"
#include "nsEscape.h"
@ -1230,8 +1230,7 @@ class DatabaseConnection::UpdateRefcountFunction final
DatabaseConnection* const mConnection;
FileManager& mFileManager;
nsClassHashtable<nsUint64HashKey, FileInfoEntry> mFileInfoEntries;
nsDataHashtable<nsUint64HashKey, NotNull<FileInfoEntry*>>
mSavepointEntriesIndex;
nsTHashMap<nsUint64HashKey, NotNull<FileInfoEntry*>> mSavepointEntriesIndex;
nsTArray<int64_t> mJournalsToCreateBeforeCommit;
nsTArray<int64_t> mJournalsToRemoveAfterCommit;
@ -1783,7 +1782,7 @@ class DatabaseOperationBase : public Runnable,
protected:
class AutoSetProgressHandler;
typedef nsDataHashtable<nsUint64HashKey, bool> UniqueIndexTable;
typedef nsTHashMap<nsUint64HashKey, bool> UniqueIndexTable;
const nsCOMPtr<nsIEventTarget> mOwningEventTarget;
const nsID mBackgroundChildLoggingId;
@ -5155,7 +5154,7 @@ class Maintenance final : public Runnable, public OpenDirectoryListener {
PRTime mStartTime;
RefPtr<DirectoryLock> mDirectoryLock;
nsTArray<DirectoryInfo> mDirectoryInfos;
nsDataHashtable<nsStringHashKey, DatabaseMaintenance*> mDatabaseMaintenances;
nsTHashMap<nsStringHashKey, DatabaseMaintenance*> mDatabaseMaintenances;
nsresult mResultCode;
Atomic<bool> mAborted;
State mState;
@ -5968,8 +5967,7 @@ typedef nsClassHashtable<nsCStringHashKey, DatabaseActorInfo>
StaticAutoPtr<DatabaseActorHashtable> gLiveDatabaseHashtable;
using PrivateBrowsingInfoHashtable =
nsDataHashtable<nsCStringHashKey, CipherKey>;
using PrivateBrowsingInfoHashtable = nsTHashMap<nsCStringHashKey, CipherKey>;
// XXX Maybe we can avoid a mutex here by moving all accesses to the background
// thread.
StaticAutoPtr<DataMutex<PrivateBrowsingInfoHashtable>>
@ -5979,12 +5977,12 @@ StaticRefPtr<ConnectionPool> gConnectionPool;
StaticRefPtr<FileHandleThreadPool> gFileHandleThreadPool;
typedef nsDataHashtable<nsIDHashKey, DatabaseLoggingInfo*>
typedef nsTHashMap<nsIDHashKey, DatabaseLoggingInfo*>
DatabaseLoggingInfoHashtable;
StaticAutoPtr<DatabaseLoggingInfoHashtable> gLoggingInfoHashtable;
typedef nsDataHashtable<nsUint32HashKey, uint32_t> TelemetryIdHashtable;
typedef nsTHashMap<nsUint32HashKey, uint32_t> TelemetryIdHashtable;
StaticAutoPtr<TelemetryIdHashtable> gTelemetryIdHashtable;

4
dom/indexedDB/FileManagerBase.h
View file

@ -10,7 +10,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/Mutex.h"
#include "mozilla/StaticMutex.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsISupportsImpl.h"
#include "FileInfoT.h"
@ -123,7 +123,7 @@ class FileManagerBase {
// Access to the following fields must be protected by
// FileManager::Mutex()
int64_t mLastFileId = 0;
nsDataHashtable<nsUint64HashKey, NotNull<FileInfo*>> mFileInfos;
nsTHashMap<nsUint64HashKey, NotNull<FileInfo*>> mFileInfos;
FlippedOnce<false> mInvalidated;
};

5
dom/indexedDB/IDBDatabase.h
View file

@ -14,7 +14,7 @@
#include "mozilla/dom/quota/PersistenceType.h"
#include "mozilla/DOMEventTargetHelper.h"
#include "mozilla/UniquePtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsString.h"
#include "nsTHashtable.h"
@ -72,8 +72,7 @@ class IDBDatabase final : public DOMEventTargetHelper {
nsTHashtable<nsPtrHashKey<IDBTransaction>> mTransactions;
nsDataHashtable<nsISupportsHashKey,
indexedDB::PBackgroundIDBDatabaseFileChild*>
nsTHashMap<nsISupportsHashKey, indexedDB::PBackgroundIDBDatabaseFileChild*>
mFileActors;
RefPtr<Observer> mObserver;

2
dom/ipc/BrowserChild.cpp
View file

@ -172,7 +172,7 @@ NS_IMPL_ISUPPORTS(ContentListener, nsIDOMEventListener)
static const char BEFORE_FIRST_PAINT[] = "before-first-paint";
typedef nsDataHashtable<nsUint64HashKey, BrowserChild*> BrowserChildMap;
typedef nsTHashMap<nsUint64HashKey, BrowserChild*> BrowserChildMap;
static BrowserChildMap* sBrowserChildren;
StaticMutex sBrowserChildrenMutex;

3
dom/ipc/BrowserParent.h
View file

@ -797,8 +797,7 @@ class BrowserParent final : public PBrowserParent,
private:
// This is used when APZ needs to find the BrowserParent associated with a
// layer to dispatch events.
typedef nsDataHashtable<nsUint64HashKey, BrowserParent*>
LayerToBrowserParentTable;
typedef nsTHashMap<nsUint64HashKey, BrowserParent*> LayerToBrowserParentTable;
static LayerToBrowserParentTable* sLayerToBrowserParentTable;
static void AddBrowserParentToTable(layers::LayersId aLayersId,

6
dom/ipc/ContentParent.cpp
View file

@ -599,7 +599,7 @@ ProcessID GetTelemetryProcessID(const nsACString& remoteType) {
} // anonymous namespace
UniquePtr<nsDataHashtable<nsUint32HashKey, ContentParent*>>
UniquePtr<nsTHashMap<nsUint32HashKey, ContentParent*>>
ContentParent::sJSPluginContentParents;
UniquePtr<nsTArray<ContentParent*>> ContentParent::sPrivateContent;
UniquePtr<LinkedList<ContentParent>> ContentParent::sContentParents;
@ -1208,7 +1208,7 @@ already_AddRefed<ContentParent> ContentParent::GetNewOrUsedJSPluginProcess(
p = sJSPluginContentParents->Get(aPluginID);
} else {
sJSPluginContentParents =
MakeUnique<nsDataHashtable<nsUint32HashKey, ContentParent*>>();
MakeUnique<nsTHashMap<nsUint32HashKey, ContentParent*>>();
}
if (p) {
@ -6865,7 +6865,7 @@ mozilla::ipc::IPCResult ContentParent::RecvAdjustWindowFocus(
("ParentIPC: Trying to send a message to dead or detached context"));
return IPC_OK();
}
nsDataHashtable<nsPtrHashKey<ContentParent>, bool> processes(2);
nsTHashMap<nsPtrHashKey<ContentParent>, bool> processes(2);
processes.InsertOrUpdate(this, true);
ContentProcessManager* cpm = ContentProcessManager::GetSingleton();

4
dom/ipc/ContentParent.h
View file

@ -34,7 +34,7 @@
#include "mozilla/UniquePtr.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsPluginTags.h"
#include "nsHashKeys.h"
#include "nsIAsyncShutdown.h"
@ -754,7 +754,7 @@ class ContentParent final
static nsClassHashtable<nsCStringHashKey, nsTArray<ContentParent*>>*
sBrowserContentParents;
static UniquePtr<nsTArray<ContentParent*>> sPrivateContent;
static UniquePtr<nsDataHashtable<nsUint32HashKey, ContentParent*>>
static UniquePtr<nsTHashMap<nsUint32HashKey, ContentParent*>>
sJSPluginContentParents;
static UniquePtr<LinkedList<ContentParent>> sContentParents;

6
dom/ipc/ContentProcessManager.h
View file

@ -11,7 +11,7 @@
#include "mozilla/dom/TabContext.h"
#include "mozilla/dom/ipc/IdType.h"
#include "nsTArray.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
namespace mozilla {
namespace dom {
@ -80,8 +80,8 @@ class ContentProcessManager final {
private:
static StaticAutoPtr<ContentProcessManager> sSingleton;
nsDataHashtable<nsUint64HashKey, ContentParent*> mContentParentMap;
nsDataHashtable<nsUint64HashKey, BrowserParent*> mBrowserParentMap;
nsTHashMap<nsUint64HashKey, ContentParent*> mContentParentMap;
nsTHashMap<nsUint64HashKey, BrowserParent*> mBrowserParentMap;
MOZ_COUNTED_DEFAULT_CTOR(ContentProcessManager);
};

2
dom/ipc/ProcessHangMonitor.cpp
View file

@ -304,7 +304,7 @@ class HangMonitorParent : public PProcessHangMonitorParent,
bool mShutdownDone;
// Map from plugin ID to crash dump ID. Protected by
// mBrowserCrashDumpHashLock.
nsDataHashtable<nsUint32HashKey, nsString> mBrowserCrashDumpIds;
nsTHashMap<nsUint32HashKey, nsString> mBrowserCrashDumpIds;
Mutex mBrowserCrashDumpHashLock;
mozilla::ipc::TaskFactory<HangMonitorParent> mMainThreadTaskFactory;
};

4
dom/ipc/SharedStringMap.h
View file

@ -10,7 +10,7 @@
#include "mozilla/AutoMemMap.h"
#include "mozilla/Result.h"
#include "mozilla/dom/ipc/StringTable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
namespace mozilla {
namespace dom {
@ -214,7 +214,7 @@ class MOZ_RAII SharedStringMapBuilder {
StringTableBuilder<nsCStringHashKey, nsCString> mKeyTable;
StringTableBuilder<nsStringHashKey, nsString> mValueTable;
nsDataHashtable<nsCStringHashKey, Entry> mEntries;
nsTHashMap<nsCStringHashKey, Entry> mEntries;
};
} // namespace ipc

4
dom/ipc/StringTable.h
View file

@ -8,7 +8,7 @@
#define dom_ipc_StringTable_h
#include "mozilla/RangedPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
/**
* This file contains helper classes for creating and accessing compact string
@ -109,7 +109,7 @@ class StringTableBuilder {
StringType mValue;
};
nsDataHashtable<KeyType, Entry> mEntries;
nsTHashMap<KeyType, Entry> mEntries;
uint32_t mSize = 0;
};

4
dom/ipc/WindowGlobalParent.h
View file

@ -17,7 +17,7 @@
#include "mozilla/dom/PWindowGlobalParent.h"
#include "mozilla/dom/WindowContext.h"
#include "mozilla/dom/WindowGlobalActorsBinding.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsRefPtrHashtable.h"
#include "nsWrapperCache.h"
#include "nsISupports.h"
@ -302,7 +302,7 @@ class WindowGlobalParent final : public WindowContext,
void UpdateSiteOriginsFrom(WindowGlobalParent* aParent, bool aIncrease);
void Accumulate();
nsDataHashtable<nsCStringHashKey, int32_t> mOriginMap;
nsTHashMap<nsCStringHashKey, int32_t> mOriginMap;
uint32_t mMaxOrigins = 0;
};

2
dom/ipc/jsactor/JSActor.cpp
View file

@ -70,7 +70,7 @@ void JSActor::AfterDestroy() {
// Take our queries out, in case somehow rejecting promises can trigger
// additions or removals.
nsDataHashtable<nsUint64HashKey, PendingQuery> pendingQueries;
nsTHashMap<nsUint64HashKey, PendingQuery> pendingQueries;
mPendingQueries.SwapElements(pendingQueries);
for (auto& entry : pendingQueries) {
nsPrintfCString message(

4
dom/ipc/jsactor/JSActor.h
View file

@ -12,7 +12,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/dom/PromiseNativeHandler.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsWrapperCache.h"
class nsIGlobalObject;
@ -156,7 +156,7 @@ class JSActor : public nsISupports, public nsWrapperCache {
nsCOMPtr<nsIGlobalObject> mGlobal;
nsCOMPtr<nsISupports> mWrappedJS;
nsCString mName;
nsDataHashtable<nsUint64HashKey, PendingQuery> mPendingQueries;
nsTHashMap<nsUint64HashKey, PendingQuery> mPendingQueries;
uint64_t mNextQueryId = 0;
bool mCanSend = true;
};

14
dom/localstorage/ActorsParent.cpp
View file

@ -92,7 +92,7 @@
#include "nsBaseHashtable.h"
#include "nsCOMPtr.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsError.h"
#include "nsExceptionHandler.h"
@ -1444,7 +1444,7 @@ class Datastore final
* Non-authoritative hashtable representation of mOrderedItems for efficient
* lookup.
*/
nsDataHashtable<nsStringHashKey, LSValue> mValues;
nsTHashMap<nsStringHashKey, LSValue> mValues;
/**
* The authoritative ordered state of the Datastore; mValue also exists as an
* unordered hashtable for efficient lookup.
@ -1469,7 +1469,7 @@ class Datastore final
RefPtr<DirectoryLock>&& aDirectoryLock,
RefPtr<Connection>&& aConnection,
RefPtr<QuotaObject>&& aQuotaObject,
nsDataHashtable<nsStringHashKey, LSValue>& aValues,
nsTHashMap<nsStringHashKey, LSValue>& aValues,
nsTArray<LSItemInfo>&& aOrderedItems);
Maybe<DirectoryLock&> MaybeDirectoryLockRef() const {
@ -1844,7 +1844,7 @@ class Snapshot final : public PBackgroundLSSnapshotParent {
* are changed/evicted from the Datastore as they happen, as reported to us by
* SaveItem notifications.
*/
nsDataHashtable<nsStringHashKey, LSValue> mValues;
nsTHashMap<nsStringHashKey, LSValue> mValues;
/**
* Latched state of mDatastore's keys during a SaveItem notification with
* aAffectsOrder=true. The ordered keys needed to be saved off so that a
@ -2172,7 +2172,7 @@ class PrepareDatastoreOp
RefPtr<Datastore> mDatastore;
UniquePtr<ArchivedOriginScope> mArchivedOriginScope;
LoadDataOp* mLoadDataOp;
nsDataHashtable<nsStringHashKey, LSValue> mValues;
nsTHashMap<nsStringHashKey, LSValue> mValues;
nsTArray<LSItemInfo> mOrderedItems;
OriginMetadata mOriginMetadata;
nsCString mMainThreadOrigin;
@ -2769,7 +2769,7 @@ Atomic<int32_t, Relaxed> gSnapshotGradualPrefill(
kDefaultSnapshotGradualPrefill);
Atomic<bool> gClientValidation(kDefaultClientValidation);
typedef nsDataHashtable<nsCStringHashKey, int64_t> UsageHashtable;
typedef nsTHashMap<nsCStringHashKey, int64_t> UsageHashtable;
StaticAutoPtr<ArchivedOriginHashtable> gArchivedOrigins;
@ -4250,7 +4250,7 @@ Datastore::Datastore(const OriginMetadata& aOriginMetadata,
RefPtr<DirectoryLock>&& aDirectoryLock,
RefPtr<Connection>&& aConnection,
RefPtr<QuotaObject>&& aQuotaObject,
nsDataHashtable<nsStringHashKey, LSValue>& aValues,
nsTHashMap<nsStringHashKey, LSValue>& aValues,
nsTArray<LSItemInfo>&& aOrderedItems)
: mDirectoryLock(std::move(aDirectoryLock)),
mConnection(std::move(aConnection)),

4
dom/localstorage/LSDatabase.cpp
View file

@ -23,7 +23,7 @@
#include "mozilla/dom/PBackgroundLSDatabase.h"
#include "nsBaseHashtable.h"
#include "nsCOMPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsError.h"
#include "nsHashKeys.h"
@ -39,7 +39,7 @@ namespace {
#define XPCOM_SHUTDOWN_OBSERVER_TOPIC "xpcom-shutdown"
typedef nsDataHashtable<nsCStringHashKey, LSDatabase*> LSDatabaseHashtable;
typedef nsTHashMap<nsCStringHashKey, LSDatabase*> LSDatabaseHashtable;
StaticAutoPtr<LSDatabaseHashtable> gLSDatabases;

4
dom/localstorage/LSObserver.cpp
View file

@ -12,14 +12,14 @@
// Global includes
#include <utility>
#include "mozilla/StaticPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
namespace mozilla::dom {
namespace {
typedef nsDataHashtable<nsCStringHashKey, LSObserver*> LSObserverHashtable;
typedef nsTHashMap<nsCStringHashKey, LSObserver*> LSObserverHashtable;
StaticAutoPtr<LSObserverHashtable> gLSObservers;

2
dom/localstorage/LSSnapshot.cpp
View file

@ -784,7 +784,7 @@ nsresult LSSnapshot::EnsureAllKeys() {
return NS_ERROR_FAILURE;
}
nsDataHashtable<nsStringHashKey, nsString> newValues;
nsTHashMap<nsStringHashKey, nsString> newValues;
for (auto key : keys) {
newValues.InsertOrUpdate(key, VoidString());

4
dom/localstorage/LSSnapshot.h
View file

@ -14,7 +14,7 @@
#include "mozilla/RefPtr.h"
#include "mozilla/UniquePtr.h"
#include "nsCOMPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsIRunnable.h"
#include "nsISupports.h"
@ -97,7 +97,7 @@ class LSSnapshot final : public nsIRunnable {
nsTHashtable<nsStringHashKey> mLoadedItems;
nsTHashtable<nsStringHashKey> mUnknownItems;
nsDataHashtable<nsStringHashKey, nsString> mValues;
nsTHashMap<nsStringHashKey, nsString> mValues;
UniquePtr<SnapshotWriteOptimizer> mWriteOptimizer;
UniquePtr<nsTArray<LSWriteAndNotifyInfo>> mWriteAndNotifyInfos;

4
dom/media/MediaInfo.h
View file

@ -8,7 +8,7 @@
# include "mozilla/UniquePtr.h"
# include "mozilla/RefPtr.h"
# include "nsDataHashtable.h"
# include "nsTHashMap.h"
# include "nsString.h"
# include "nsTArray.h"
# include "AudioConfig.h"
@ -36,7 +36,7 @@ class MetadataTag {
}
};
typedef nsDataHashtable<nsCStringHashKey, nsCString> MetadataTags;
typedef nsTHashMap<nsCStringHashKey, nsCString> MetadataTags;
class TrackInfo {
public:

2
dom/media/MediaTrackGraph.cpp
View file

@ -60,7 +60,7 @@ LazyLogModule gMediaTrackGraphLog("MediaTrackGraph");
*
* The key is a hash of nsPIDOMWindowInner, see `WindowToHash`.
*/
static nsDataHashtable<nsUint32HashKey, MediaTrackGraphImpl*> gGraphs;
static nsTHashMap<nsUint32HashKey, MediaTrackGraphImpl*> gGraphs;
MediaTrackGraphImpl::~MediaTrackGraphImpl() {
MOZ_ASSERT(mTracks.IsEmpty() && mSuspendedTracks.IsEmpty(),

2
dom/media/MediaTrackGraphImpl.h
View file

@ -770,7 +770,7 @@ class MediaTrackGraphImpl : public MediaTrackGraph,
// used to deliver audio input frames and to notify the listeners that the
// audio device that delivers the audio frames has changed.
// This is only touched on the graph thread.
nsDataHashtable<nsVoidPtrHashKey, nsTArray<RefPtr<AudioDataListener>>>
nsTHashMap<nsVoidPtrHashKey, nsTArray<RefPtr<AudioDataListener>>>
mInputDeviceUsers;
/**

4
dom/media/eme/MediaKeySystemAccessManager.cpp
View file

@ -22,7 +22,7 @@
#endif
#include "nsComponentManagerUtils.h"
#include "nsContentUtils.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsIObserverService.h"
#include "nsIScriptError.h"
#include "nsPrintfCString.h"
@ -459,7 +459,7 @@ void MediaKeySystemAccessManager::RequestMediaKeySystemAccess(
}
nsCOMPtr<Document> doc = mWindow->GetExtantDoc();
nsDataHashtable<nsCharPtrHashKey, bool> warnings;
nsTHashMap<nsCharPtrHashKey, bool> warnings;
std::function<void(const char*)> deprecationWarningLogFn =
[&](const char* aMsgName) {
EME_LOG(

2
dom/media/eme/MediaKeys.h
View file

@ -41,7 +41,7 @@ typedef nsRefPtrHashtable<nsStringHashKey, MediaKeySession> KeySessionHashMap;
typedef nsRefPtrHashtable<nsUint32HashKey, dom::DetailedPromise> PromiseHashMap;
typedef nsRefPtrHashtable<nsUint32HashKey, MediaKeySession>
PendingKeySessionsHashMap;
typedef nsDataHashtable<nsUint32HashKey, uint32_t> PendingPromiseIdTokenHashMap;
typedef nsTHashMap<nsUint32HashKey, uint32_t> PendingPromiseIdTokenHashMap;
typedef uint32_t PromiseId;
// This class is used on the main thread only.

4
dom/media/gmp/ChromiumCDMParent.h
View file

@ -12,7 +12,7 @@
#include "GMPMessageUtils.h"
#include "mozilla/gmp/PChromiumCDMParent.h"
#include "mozilla/RefPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "PlatformDecoderModule.h"
#include "ImageContainer.h"
#include "mozilla/Span.h"
@ -154,7 +154,7 @@ class ChromiumCDMParent final : public PChromiumCDMParent,
// Note: this pointer is a weak reference as ChromiumCDMProxy has a strong
// reference to the ChromiumCDMCallback.
ChromiumCDMCallback* mCDMCallback = nullptr;
nsDataHashtable<nsUint32HashKey, uint32_t> mPromiseToCreateSessionToken;
nsTHashMap<nsUint32HashKey, uint32_t> mPromiseToCreateSessionToken;
nsTArray<RefPtr<DecryptJob>> mDecrypts;
MozPromiseHolder<InitPromise> mInitPromise;

4
dom/media/gmp/GMPServiceParent.h
View file

@ -10,7 +10,7 @@
#include "mozilla/gmp/PGMPServiceParent.h"
#include "mozIGeckoMediaPluginChromeService.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "mozilla/Atomics.h"
#include "nsIAsyncShutdown.h"
#include "nsRefPtrHashtable.h"
@ -191,7 +191,7 @@ class GeckoMediaPluginServiceParent final
// Hashes node id to whether that node id is allowed to store data
// persistently on disk.
nsDataHashtable<nsCStringHashKey, bool> mPersistentStorageAllowed;
nsTHashMap<nsCStringHashKey, bool> mPersistentStorageAllowed;
// Synchronization for barrier that ensures we've loaded GMPs from
// MOZ_GMP_PATH before allowing GetContentParentFrom() to proceed.

4
dom/media/gmp/GMPTimerChild.h
View file

@ -8,7 +8,7 @@
#include "mozilla/gmp/PGMPTimerChild.h"
#include "mozilla/Monitor.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "gmp-errors.h"
#include "gmp-platform.h"
@ -35,7 +35,7 @@ class GMPTimerChild : public PGMPTimerChild {
private:
~GMPTimerChild();
nsDataHashtable<nsUint32HashKey, GMPTask*> mTimers;
nsTHashMap<nsUint32HashKey, GMPTask*> mTimers;
uint32_t mTimerCount;
GMPChild* mPlugin;

4
dom/media/mediacapabilities/DecoderBenchmark.cpp
View file

@ -189,8 +189,8 @@ RefPtr<BenchmarkScorePromise> DecoderBenchmark::Get(
KeyUtil::CreateKey(aBenchInfo));
}
static nsDataHashtable<nsCStringHashKey, int32_t> DecoderVersionTable() {
nsDataHashtable<nsCStringHashKey, int32_t> decoderVersionTable;
static nsTHashMap<nsCStringHashKey, int32_t> DecoderVersionTable() {
nsTHashMap<nsCStringHashKey, int32_t> decoderVersionTable;
/*
* For the decoders listed here, the benchmark version number will be checked.

4
dom/media/mediacontrol/MediaStatusManager.h
View file

@ -11,7 +11,7 @@
#include "mozilla/dom/MediaMetadata.h"
#include "mozilla/dom/MediaSessionBinding.h"
#include "mozilla/Maybe.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsISupportsImpl.h"
namespace mozilla {
@ -262,7 +262,7 @@ class MediaStatusManager : public IMediaInfoUpdater {
MediaSessionPlaybackState mActualPlaybackState =
MediaSessionPlaybackState::None;
nsDataHashtable<nsUint64HashKey, MediaSessionInfo> mMediaSessionInfoMap;
nsTHashMap<nsUint64HashKey, MediaSessionInfo> mMediaSessionInfoMap;
MediaEventProducer<MediaMetadataBase> mMetadataChangedEvent;
MediaEventProducer<nsTArray<MediaSessionAction>>
mSupportedActionsChangedEvent;

4
dom/media/systemservices/MediaSystemResourceManager.h
View file

@ -12,7 +12,7 @@
# include "MediaSystemResourceTypes.h"
# include "mozilla/ReentrantMonitor.h"
# include "mozilla/StaticPtr.h"
# include "nsDataHashtable.h"
# include "nsTHashMap.h"
# include "nsISupportsImpl.h"
namespace mozilla {
@ -71,7 +71,7 @@ class MediaSystemResourceManager {
media::MediaSystemResourceManagerChild* mChild;
nsDataHashtable<nsUint32HashKey, MediaSystemResourceClient*> mResourceClients;
nsTHashMap<nsUint32HashKey, MediaSystemResourceClient*> mResourceClients;
static StaticRefPtr<MediaSystemResourceManager> sSingleton;
};

5
dom/media/webaudio/AudioContext.h
View file

@ -21,7 +21,7 @@
#include "mozilla/UniquePtr.h"
#include "nsCOMPtr.h"
#include "nsCycleCollectionParticipant.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsTHashtable.h"
#include "js/TypeDecls.h"
@ -402,8 +402,7 @@ class AudioContext final : public DOMEventTargetHelper,
nsTHashtable<nsRefPtrHashKey<AudioNode>> mActiveNodes;
// Raw (non-owning) references to all AudioNodes for this AudioContext.
nsTHashtable<nsPtrHashKey<AudioNode>> mAllNodes;
nsDataHashtable<nsStringHashKey, AudioParamDescriptorMap>
mWorkletParamDescriptors;
nsTHashMap<nsStringHashKey, AudioParamDescriptorMap> mWorkletParamDescriptors;
// Cache to avoid recomputing basic waveforms all the time.
RefPtr<BasicWaveFormCache> mBasicWaveFormCache;
// Number of channels passed in the OfflineAudioContext ctor.

2
dom/payments/PaymentRequestManager.h
View file

@ -92,7 +92,7 @@ class PaymentRequestManager final {
void NotifyRequestDone(PaymentRequest* aRequest);
// Strong pointer to requests with ongoing IPC messages to the parent.
nsDataHashtable<nsRefPtrHashKey<PaymentRequest>, uint32_t> mActivePayments;
nsTHashMap<nsRefPtrHashKey<PaymentRequest>, uint32_t> mActivePayments;
nsTArray<nsString> mSupportedRegions;
};

2
dom/plugins/ipc/PluginInstanceChild.h
View file

@ -346,7 +346,7 @@ class PluginInstanceChild : public PPluginInstanceChild {
nsRefPtrHashtable<nsPtrHashKey<NPAsyncSurface>, DirectBitmap> mDirectBitmaps;
#if defined(XP_WIN)
nsDataHashtable<nsPtrHashKey<NPAsyncSurface>, WindowsHandle> mDxgiSurfaces;
nsTHashMap<nsPtrHashKey<NPAsyncSurface>, WindowsHandle> mDxgiSurfaces;
#endif
mozilla::Mutex mAsyncInvalidateMutex;

4
dom/plugins/ipc/PluginInstanceParent.h
View file

@ -19,7 +19,7 @@
#endif
#include "npfunctions.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsRect.h"
@ -322,7 +322,7 @@ class PluginInstanceParent : public PPluginInstanceParent {
// drawing model has changed.
int mLastRecordedDrawingModel;
nsDataHashtable<nsPtrHashKey<NPObject>, PluginScriptableObjectParent*>
nsTHashMap<nsPtrHashKey<NPObject>, PluginScriptableObjectParent*>
mScriptableObjects;
// This is used to tell the compositor that it should invalidate the

4
dom/presentation/PresentationServiceBase.h
View file

@ -15,7 +15,7 @@
#include "nsRefPtrHashtable.h"
#include "nsString.h"
#include "nsTArray.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsThread.h"
namespace mozilla {
@ -114,7 +114,7 @@ class PresentationServiceBase {
private:
nsClassHashtable<nsUint64HashKey, nsTArray<nsString>> mRespondingSessionIds;
nsDataHashtable<nsStringHashKey, uint64_t> mRespondingWindowIds;
nsTHashMap<nsStringHashKey, uint64_t> mRespondingWindowIds;
};
class AvailabilityManager final {

8
dom/quota/ActorsParent.cpp
View file

@ -103,7 +103,7 @@
#include "nsClassHashtable.h"
#include "nsComponentManagerUtils.h"
#include "nsContentUtils.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsDirectoryServiceUtils.h"
#include "nsError.h"
@ -854,7 +854,7 @@ class OriginInfo final {
void LockedPersist();
nsDataHashtable<nsStringHashKey, NotNull<QuotaObject*>> mQuotaObjects;
nsTHashMap<nsStringHashKey, NotNull<QuotaObject*>> mQuotaObjects;
ClientUsageArray mClientUsages;
GroupInfo* mGroupInfo;
const nsCString mOrigin;
@ -1347,7 +1347,7 @@ class TraverseRepositoryHelper {
class GetUsageOp final : public QuotaUsageRequestBase,
public TraverseRepositoryHelper {
nsTArray<OriginUsage> mOriginUsages;
nsDataHashtable<nsCStringHashKey, uint32_t> mOriginUsagesIndex;
nsTHashMap<nsCStringHashKey, uint32_t> mOriginUsagesIndex;
bool mGetAll;
@ -3340,7 +3340,7 @@ void QuotaManager::RegisterDirectoryLock(DirectoryLockImpl& aLock) {
// XXX It seems that the contents of the array are never actually used, we
// just use that like an inefficient use counter. Can't we just change
// DirectoryLockTable to a nsDataHashtable<nsCStringHashKey, uint32_t>?
// DirectoryLockTable to a nsTHashMap<nsCStringHashKey, uint32_t>?
directoryLockTable
.LookupOrInsertWith(
aLock.Origin(),

8
dom/quota/QuotaManager.h
View file

@ -25,7 +25,7 @@
#include "mozilla/dom/quota/QuotaCommon.h"
#include "nsCOMPtr.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsHashKeys.h"
#include "nsISupports.h"
@ -581,7 +581,7 @@ class QuotaManager final : public BackgroundThreadObject {
// all modifications (including those on the owning thread) and all reads off
// the owning thread must be protected by mQuotaMutex. In other words, only
// reads on the owning thread don't have to be protected by mQuotaMutex.
nsDataHashtable<nsUint64HashKey, NotNull<DirectoryLockImpl*>>
nsTHashMap<nsUint64HashKey, NotNull<DirectoryLockImpl*>>
mDirectoryLockIdTable;
// Directory lock tables that are used to update origin access time.
@ -595,7 +595,7 @@ class QuotaManager final : public BackgroundThreadObject {
// A hash table that is used to cache origin parser results for given
// sanitized origin strings. This hash table isn't protected by any mutex but
// it is only ever touched on the IO thread.
nsDataHashtable<nsCStringHashKey, bool> mValidOrigins;
nsTHashMap<nsCStringHashKey, bool> mValidOrigins;
struct OriginInitializationInfo {
bool mPersistentOriginAttempted : 1;
@ -605,7 +605,7 @@ class QuotaManager final : public BackgroundThreadObject {
// A hash table that is currently used to track origin initialization
// attempts. This hash table isn't protected by any mutex but it is only ever
// touched on the IO thread.
nsDataHashtable<nsCStringHashKey, OriginInitializationInfo>
nsTHashMap<nsCStringHashKey, OriginInitializationInfo>
mOriginInitializationInfos;
// This array is populated at initialization time and then never modified, so

4
dom/storage/LocalStorageCache.h
View file

@ -10,7 +10,7 @@
#include "nsIPrincipal.h"
#include "nsString.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "mozilla/Monitor.h"
#include "mozilla/Telemetry.h"
@ -159,7 +159,7 @@ class LocalStorageCache : public LocalStorageCacheBridge {
public:
Data() : mOriginQuotaUsage(0) {}
int64_t mOriginQuotaUsage;
nsDataHashtable<nsStringHashKey, nsString> mKeys;
nsTHashMap<nsStringHashKey, nsString> mKeys;
};
public:

4
dom/storage/SessionStorageCache.h
View file

@ -9,7 +9,7 @@
#include "mozilla/UniquePtr.h"
#include "mozilla/dom/LSWriteOptimizerImpl.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
namespace mozilla {
namespace dom {
@ -92,7 +92,7 @@ class SessionStorageCache final {
bool ProcessUsageDelta(int64_t aDelta);
nsDataHashtable<nsStringHashKey, nsString> mKeys;
nsTHashMap<nsStringHashKey, nsString> mKeys;
SSWriteOptimizer mWriteOptimizer;

2
dom/storage/SessionStorageManager.cpp
View file

@ -20,7 +20,7 @@
#include "mozilla/ipc/BackgroundChild.h"
#include "mozilla/ipc/BackgroundParent.h"
#include "mozilla/ipc/PBackgroundChild.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsThreadUtils.h"
namespace mozilla {

4
dom/storage/StorageActivityService.h
View file

@ -7,7 +7,7 @@
#ifndef mozilla_dom_StorageActivityService_h
#define mozilla_dom_StorageActivityService_h
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsIObserver.h"
#include "nsIStorageActivityService.h"
#include "nsITimer.h"
@ -58,7 +58,7 @@ class StorageActivityService final : public nsIStorageActivityService,
void MaybeStopTimer();
// Activities grouped by origin (+OriginAttributes).
nsDataHashtable<nsCStringHashKey, PRTime> mActivities;
nsTHashMap<nsCStringHashKey, PRTime> mActivities;
nsCOMPtr<nsITimer> mTimer;
};

4
dom/svg/SVGAttrTearoffTable.h
View file

@ -8,7 +8,7 @@
#define DOM_SVG_SVGATTRTEAROFFTABLE_H_
#include "mozilla/DebugOnly.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsDebug.h"
#include "nsHashKeys.h"
@ -39,7 +39,7 @@ class SVGAttrTearoffTable {
private:
using SimpleTypePtrKey = nsPtrHashKey<SimpleType>;
using TearoffTable = nsDataHashtable<SimpleTypePtrKey, TearoffType*>;
using TearoffTable = nsTHashMap<SimpleTypePtrKey, TearoffType*>;
TearoffTable* mTable;
};

4
dom/svg/SVGElementFactory.cpp
View file

@ -11,7 +11,7 @@
#include "mozilla/dom/Element.h"
#include "mozilla/dom/FromParser.h"
#include "mozilla/StaticPtr.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
using namespace mozilla;
@ -19,7 +19,7 @@ using namespace mozilla::dom;
// Hash table that maps nsAtom* SVG tags to a SVGContentCreatorFunction.
using TagAtomTable =
nsDataHashtable<nsPtrHashKey<nsAtom>, SVGContentCreatorFunction>;
nsTHashMap<nsPtrHashKey<nsAtom>, SVGContentCreatorFunction>;
StaticAutoPtr<TagAtomTable> sTagAtomTable;
#define SVG_TAG(_tag, _classname) \

2
gfx/gl/GLContextProviderEGL.cpp
View file

@ -125,7 +125,7 @@ class WaylandGLSurface {
struct wl_egl_window* mEGLWindow;
};
static nsDataHashtable<nsPtrHashKey<void>, WaylandGLSurface*> sWaylandGLSurface;
static nsTHashMap<nsPtrHashKey<void>, WaylandGLSurface*> sWaylandGLSurface;
void DeleteWaylandGLSurface(EGLSurface surface) {
// We're running on Wayland which means our EGLSurface may

4
gfx/ipc/CrossProcessPaint.h
View file

@ -15,7 +15,7 @@
#include "mozilla/MozPromise.h"
#include "mozilla/ipc/ByteBuf.h"
#include "nsColor.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "nsRefPtrHashtable.h"
#include "nsTHashtable.h"
@ -134,7 +134,7 @@ class CrossProcessPaint final {
void LostFragment(dom::WindowGlobalParent* aWGP);
private:
typedef nsDataHashtable<nsUint64HashKey, PaintFragment> ReceivedFragmentMap;
typedef nsTHashMap<nsUint64HashKey, PaintFragment> ReceivedFragmentMap;
CrossProcessPaint(float aScale, dom::TabId aRoot);
~CrossProcessPaint();

6
gfx/layers/FrameMetrics.h
View file

@ -23,7 +23,7 @@
#include "mozilla/ScrollPositionUpdate.h" // for ScrollPositionUpdate
#include "mozilla/StaticPtr.h" // for StaticAutoPtr
#include "mozilla/TimeStamp.h" // for TimeStamp
#include "nsDataHashtable.h" // for nsDataHashtable
#include "nsTHashMap.h" // for nsTHashMap
#include "nsString.h"
#include "PLDHashTable.h" // for PLDHashNumber
@ -1062,8 +1062,8 @@ struct ScrollMetadata {
// Please add new fields above this comment.
};
typedef nsDataHashtable<ScrollableLayerGuid::ViewIDHashKey,
nsTArray<ScrollPositionUpdate>>
typedef nsTHashMap<ScrollableLayerGuid::ViewIDHashKey,
nsTArray<ScrollPositionUpdate>>
ScrollUpdatesMap;
} // namespace layers

5
gfx/layers/LayerTreeInvalidation.cpp
View file

@ -17,7 +17,7 @@
#include "mozilla/gfx/BaseSize.h" // for BaseSize
#include "mozilla/gfx/Point.h" // for IntSize
#include "mozilla/mozalloc.h" // for operator new, etc
#include "nsDataHashtable.h" // for nsDataHashtable
#include "nsTHashMap.h" // for nsTHashMap
#include "nsDebug.h" // for NS_ASSERTION
#include "nsHashKeys.h" // for nsPtrHashKey
#include "nsISupportsImpl.h" // for Layer::AddRef, etc
@ -425,8 +425,7 @@ struct ContainerLayerProperties : public LayerPropertiesBase {
// TODO: Consider how we could avoid unnecessary invalidation when children
// change order, and whether the overhead would be worth it.
nsDataHashtable<nsPtrHashKey<Layer>, uint32_t> oldIndexMap(
mChildren.Length());
nsTHashMap<nsPtrHashKey<Layer>, uint32_t> oldIndexMap(mChildren.Length());
for (uint32_t i = 0; i < mChildren.Length(); ++i) {
mChildren[i]->CheckCanary();
oldIndexMap.InsertOrUpdate(mChildren[i]->mLayer, i);

3
gfx/layers/ipc/ShadowLayers.h
View file

@ -24,6 +24,7 @@
#include "nsCOMPtr.h" // for already_AddRefed
#include "nsRegion.h" // for nsIntRegion
#include "nsTArrayForwardDeclare.h" // for nsTArray
#include "nsTHashMap.h"
#include "nsIWidget.h"
#include <vector>
@ -423,7 +424,7 @@ class ShadowLayerForwarder final : public LayersIPCActor,
nsTArray<PluginWindowData> mPluginWindowData;
UniquePtr<ActiveResourceTracker> mActiveResourceTracker;
uint64_t mNextLayerHandle;
nsDataHashtable<nsUint64HashKey, CompositableClient*> mCompositables;
nsTHashMap<nsUint64HashKey, CompositableClient*> mCompositables;
PaintTiming mPaintTiming;
/**
* ShadowLayerForwarder might dispatch tasks to main while puppet widget and

6
gfx/layers/wr/WebRenderBridgeChild.h
View file

@ -240,7 +240,7 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
nsTArray<OpDestroy> mDestroyedActors;
nsTArray<WebRenderParentCommand> mParentCommands;
nsDataHashtable<nsUint64HashKey, CompositableClient*> mCompositables;
nsTHashMap<nsUint64HashKey, CompositableClient*> mCompositables;
bool mIsInTransaction;
bool mIsInClearCachedResources;
wr::IdNamespace mIdNamespace;
@ -255,10 +255,10 @@ class WebRenderBridgeChild final : public PWebRenderBridgeChild,
bool mSentDisplayList;
uint32_t mFontKeysDeleted;
nsDataHashtable<UnscaledFontHashKey, wr::FontKey> mFontKeys;
nsTHashMap<UnscaledFontHashKey, wr::FontKey> mFontKeys;
uint32_t mFontInstanceKeysDeleted;
nsDataHashtable<ScaledFontHashKey, wr::FontInstanceKey> mFontInstanceKeys;
nsTHashMap<ScaledFontHashKey, wr::FontInstanceKey> mFontInstanceKeys;
UniquePtr<ActiveResourceTracker> mActiveResourceTracker;

6
gfx/thebes/SharedFontList-impl.h
View file

@ -11,7 +11,7 @@
#include "gfxFontUtils.h"
#include "nsClassHashtable.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsXULAppAPI.h"
#include "mozilla/UniquePtr.h"
@ -139,8 +139,8 @@ class FontList {
*
* Only used in the parent process.
*/
void SetLocalNames(nsDataHashtable<nsCStringHashKey, LocalFaceRec::InitData>&
aLocalNameTable);
void SetLocalNames(
nsTHashMap<nsCStringHashKey, LocalFaceRec::InitData>& aLocalNameTable);
/**
* Look up a Family record by name, typically to satisfy the font-family

3
gfx/thebes/SharedFontList.cpp
View file

@ -828,8 +828,7 @@ void FontList::SetAliases(
}
void FontList::SetLocalNames(
nsDataHashtable<nsCStringHashKey, LocalFaceRec::InitData>&
aLocalNameTable) {
nsTHashMap<nsCStringHashKey, LocalFaceRec::InitData>& aLocalNameTable) {
MOZ_ASSERT(XRE_IsParentProcess());
Header& header = GetHeader();
if (header.mLocalFaceCount > 0) {

2
gfx/thebes/gfxDWriteFonts.cpp
View file

@ -469,7 +469,7 @@ bool gfxDWriteFont::ProvidesGlyphWidths() const {
int32_t gfxDWriteFont::GetGlyphWidth(uint16_t aGID) {
if (!mGlyphWidths) {
mGlyphWidths = MakeUnique<nsDataHashtable<nsUint32HashKey, int32_t>>(128);
mGlyphWidths = MakeUnique<nsTHashMap<nsUint32HashKey, int32_t>>(128);
}
return mGlyphWidths->LookupOrInsertWith(

4
gfx/thebes/gfxDWriteFonts.h
View file

@ -12,7 +12,7 @@
#include "gfxFont.h"
#include "gfxUserFontSet.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
#include "mozilla/gfx/gfxVars.h"
@ -86,7 +86,7 @@ class gfxDWriteFont final : public gfxFont {
Metrics* mMetrics;
// cache of glyph widths in 16.16 fixed-point pixels
mozilla::UniquePtr<nsDataHashtable<nsUint32HashKey, int32_t>> mGlyphWidths;
mozilla::UniquePtr<nsTHashMap<nsUint32HashKey, int32_t>> mGlyphWidths;
bool mUseSubpixelPositions;
bool mAllowManualShowGlyphs;

3
gfx/thebes/gfxFT2FontBase.cpp
View file

@ -636,8 +636,7 @@ const gfxFT2FontBase::GlyphMetrics& gfxFT2FontBase::GetCachedGlyphMetrics(
uint16_t aGID, IntRect* aBounds) {
if (!mGlyphMetrics) {
mGlyphMetrics =
mozilla::MakeUnique<nsDataHashtable<nsUint32HashKey, GlyphMetrics>>(
128);
mozilla::MakeUnique<nsTHashMap<nsUint32HashKey, GlyphMetrics>>(128);
}
return mGlyphMetrics->LookupOrInsertWith(aGID, [&] {

5
gfx/thebes/gfxFT2FontBase.h
View file

@ -11,7 +11,7 @@
#include "gfxFontEntry.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/gfx/UnscaledFontFreeType.h"
#include "nsDataHashtable.h"
#include "nsTHashMap.h"
#include "nsHashKeys.h"
class gfxFT2FontEntryBase : public gfxFontEntry {
@ -135,8 +135,7 @@ class gfxFT2FontBase : public gfxFont {
const GlyphMetrics& GetCachedGlyphMetrics(
uint16_t aGID, mozilla::gfx::IntRect* aBounds = nullptr);
mozilla::UniquePtr<nsDataHashtable<nsUint32HashKey, GlyphMetrics>>
mGlyphMetrics;
mozilla::UniquePtr<nsTHashMap<nsUint32HashKey, GlyphMetrics>> mGlyphMetrics;
};
// Helper classes used for clearing out user font data when FT font

Some files were not shown because too many files have changed in this diff Show more