Bug 1417806 - Move BoolVarChanged() next to AddBoolVarCache(). r=glandium
This makes it like the VarCache functions for int, uint, atomic unit, and float.
MozReview-Commit-ID: 4CRuvAjqGCj
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -4888,32 +4888,32 @@ Preferences::UnregisterCallback(PrefChan
return NS_OK; // Observers have been released automatically.
}
NS_ENSURE_TRUE(sPreferences, NS_ERROR_NOT_AVAILABLE);
return PREF_UnregisterCallback(aPref, aCallback, aClosure, aMatchKind);
}
static void
-BoolVarChanged(const char* aPref, void* aClosure)
-{
- CacheData* cache = static_cast<CacheData*>(aClosure);
- *static_cast<bool*>(cache->mCacheLocation) =
- Preferences::GetBool(aPref, cache->mDefaultValueBool);
-}
-
-static void
CacheDataAppendElement(CacheData* aData)
{
if (!gCacheData) {
MOZ_CRASH_UNSAFE_PRINTF("!gCacheData: %s", gCacheDataDesc);
}
gCacheData->AppendElement(aData);
}
+static void
+BoolVarChanged(const char* aPref, void* aClosure)
+{
+ CacheData* cache = static_cast<CacheData*>(aClosure);
+ *static_cast<bool*>(cache->mCacheLocation) =
+ Preferences::GetBool(aPref, cache->mDefaultValueBool);
+}
+
/* static */ nsresult
Preferences::AddBoolVarCache(bool* aCache, const char* aPref, bool aDefault)
{
NS_ASSERTION(aCache, "aCache must not be NULL");
#ifdef DEBUG
AssertNotAlreadyCached("bool", aPref, aCache);
#endif
{