wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1121760 (part 4) - Remove PL_DHashTableRawRemove(). r=poiru.

Browse Source
This commit is contained in:
Nicholas Nethercote 2015-09-14 14:23:26 -07:00
parent 4dafae0e81
commit 974fdf5900
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/base/nsContentUtils.cpp
View File

@ -4192,7 +4192,7 @@ nsContentUtils::RemoveListenerManager(nsINode *aNode)
listenerManager.swap(entry->mListenerManager);
// Remove the entry and *then* do operations that could cause further
// modification of sEventListenerManagersHash. See bug 334177.
PL_DHashTableRawRemove(sEventListenerManagersHash, entry);
sEventListenerManagersHash->RawRemove(entry);
if (listenerManager) {
listenerManager->Disconnect();
}

4
dom/plugins/base/nsJSNPRuntime.cpp
View File

@ -1845,7 +1845,7 @@ nsNPObjWrapper::OnDestroy(NPObject *npobj)
::JS_SetPrivate(entry->mJSObj, nullptr);
// Remove the npobj from the hash now that it went away.
PL_DHashTableRawRemove(sNPObjWrappers, entry);
sNPObjWrappers->RawRemove(entry);
// The finalize hook will call OnWrapperDestroyed().
}
@ -1926,7 +1926,7 @@ nsNPObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, NPObject *npobj)
if (!obj) {
// OOM? Remove the stale entry from the hash.
PL_DHashTableRawRemove(sNPObjWrappers, entry);
sNPObjWrappers->RawRemove(entry);
return nullptr;
}

4
rdf/base/nsInMemoryDataSource.cpp
View File

@ -1223,7 +1223,7 @@ InMemoryDataSource::LockedUnassert(nsIRDFResource* aSource,
as = next;
if (first) {
PL_DHashTableRawRemove(root->u.hash.mPropertyHash, hdr);
root->u.hash.mPropertyHash->RawRemove(hdr);
if (next && next->mNext) {
PLDHashEntryHdr* hdr =
@ -1858,7 +1858,7 @@ InMemoryDataSource::SweepForwardArcsEntries(PLDHashTable* aTable,
// Wow, it was the _only_ one. Unhash it.
if (! rentry->mAssertions) {
PL_DHashTableRawRemove(aInfo->mReverseArcs, hdr);
aInfo->mReverseArcs->RawRemove(hdr);
}
// add to the list of assertions to unassert

2
xpcom/glue/nsTHashtable.h
View File

@ -173,7 +173,7 @@ public:
*/
void RawRemoveEntry(EntryType* aEntry)
{
PL_DHashTableRawRemove(&mTable, aEntry);
mTable.RawRemove(aEntry);
}
// This is an iterator that also allows entry removal. Example usage:

8
xpcom/glue/pldhash.cpp
View File

@ -678,7 +678,7 @@ PLDHashTable::RemoveEntry(PLDHashEntryHdr* aEntry)
ShrinkIfAppropriate();
}
MOZ_ALWAYS_INLINE void
void
PLDHashTable::RawRemove(PLDHashEntryHdr* aEntry)
{
// Unfortunately, we can only do weak checking here. That's because
@ -702,12 +702,6 @@ PLDHashTable::RawRemove(PLDHashEntryHdr* aEntry)
mEntryCount--;
}
void
PL_DHashTableRawRemove(PLDHashTable* aTable, PLDHashEntryHdr* aEntry)
{
aTable->RawRemove(aEntry);
}
// Shrink or compress if a quarter or more of all entries are removed, or if the
// table is underloaded according to the minimum alpha, and is not minimal-size
// already.

3
xpcom/glue/pldhash.h
View File

@ -620,9 +620,6 @@ PL_DHashClearEntryStub(PLDHashTable* aTable, PLDHashEntryHdr* aEntry);
const PLDHashTableOps*
PL_DHashGetStubOps(void);
void
PL_DHashTableRawRemove(PLDHashTable* aTable, PLDHashEntryHdr* aEntry);
#ifdef DEBUG
void
PL_DHashMarkTableImmutable(PLDHashTable* aTable);