Bug 1415799 - Inline and remove pref_SizeOfPrivateData(). r=glandium
It has a single call site.
MozReview-Commit-ID: DhpO2vyeC61
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -1060,27 +1060,16 @@ pref_HashPref(const char* aKey,
if (valueChanged) {
return pref_DoCallback(aKey);
}
return NS_OK;
}
-static size_t
-pref_SizeOfPrivateData(MallocSizeOf aMallocSizeOf)
-{
- size_t n = gPrefNameArena.SizeOfExcludingThis(aMallocSizeOf);
- for (CallbackNode* node = gFirstCallback; node; node = node->mNext) {
- n += aMallocSizeOf(node);
- n += aMallocSizeOf(node->mDomain);
- }
- return n;
-}
-
// Bool function that returns whether or not the preference is locked and
// therefore cannot be changed.
static bool
PREF_PrefIsLocked(const char* aPrefName)
{
bool result = false;
if (gIsAnyPrefLocked && gHashTable) {
PrefHashEntry* pref = pref_HashTableLookup(aPrefName);
@@ -3462,17 +3451,21 @@ Preferences::SizeOfIncludingThisAndOther
->SizeOfIncludingThis(aMallocSizeOf);
}
if (sPreferences->mDefaultRootBranch) {
n += static_cast<nsPrefBranch*>(sPreferences->mDefaultRootBranch.get())
->SizeOfIncludingThis(aMallocSizeOf);
}
- n += pref_SizeOfPrivateData(aMallocSizeOf);
+ n += gPrefNameArena.SizeOfExcludingThis(aMallocSizeOf);
+ for (CallbackNode* node = gFirstCallback; node; node = node->mNext) {
+ n += aMallocSizeOf(node);
+ n += aMallocSizeOf(node->mDomain);
+ }
return n;
}
class PreferenceServiceReporter final : public nsIMemoryReporter
{
~PreferenceServiceReporter() {}