Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1477254, bug 1475836) for bustages in builds/worker/workspace/build/src/modules/libpref/Preferences.cpp:4791:1 on a CLOSED TREE

Browse Source 
Backed out changeset 1b389b00030e (bug 1477254)
Backed out changeset 3b9846062755 (bug 1475836)
This commit is contained in:
shindli 2018-07-24 03:52:40 +03:00
parent 43de9e89bf
commit e0391b2197
1 changed files with 3 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
modules/libpref/Preferences.cpp
View File

@ -1693,8 +1693,7 @@ static Result<Pref*, nsresult>
pref_LookupForModify(const char* aPrefName,
const std::function<bool(const PrefWrapper&)>& aCheckFn)
{
Maybe<PrefWrapper> wrapper =
pref_Lookup(aPrefName, /* includeTypeNone */ true);
Maybe<PrefWrapper> wrapper = pref_Lookup(aPrefName, /* includeTypeNone */ true);
if (wrapper.isNothing()) {
return Err(NS_ERROR_INVALID_ARG);
}
@ -1757,8 +1756,8 @@ pref_SetPref(const char* aPrefName,
bool valueChanged = false;
nsresult rv;
if (aKind == PrefValueKind::Default) {
rv =
pref->SetDefaultValue(aType, aValue, aIsSticky, aIsLocked, &valueChanged);
rv = pref->SetDefaultValue(
aType, aValue, aIsSticky, aIsLocked, &valueChanged);
} else {
MOZ_ASSERT(!aIsLocked); // `locked` is disallowed in user pref files
rv = pref->SetUserValue(aType, aValue, aFromInit, &valueChanged);
@ -2896,8 +2895,6 @@ nsPrefBranch::DeleteBranch(const char* aStartingAt)
nsDependentCString name(pref->Name());
if (StringBeginsWith(name, branchName) || name.Equals(branchNameNoDot)) {
iter.Remove();
// The saved callback pref may be invalid now.
gCallbackPref = nullptr;
}
}
@ -4779,41 +4776,6 @@ pref_ReadPrefFromJar(nsZipArchive* aJarReader, const char* aName)
return NS_OK;
}
// These preference getter wrappers allow us to look up the value for static
// preferences based on their native types, rather than manually mapping them to
// the appropriate Preferences::Get* functions.
template<typename T>
static T
GetPref(const char* aName, T aDefaultValue);
template<>
bool
GetPref<bool>(const char* aName, bool aDefaultValue)
{
return Preferences::GetBool(aName, aDefaultValue);
}
template<>
int32_t
GetPref<int32_t>(const char* aName, int32_t aDefaultValue)
{
return Preferences::GetInt(aName, aDefaultValue);
}
template<>
uint32_t
GetPref<uint32_t>(const char* aName, uint32_t aDefaultValue)
{
return Preferences::GetInt(aName, aDefaultValue);
}
template<>
float MOZ_MAYBE_UNUSED
GetPref<float>(const char* aName, float aDefaultValue)
{
return Preferences::GetFloat(aName, aDefaultValue);
}
// Initialize default preference JavaScript buffers from appropriate TEXT
// resources.
/* static */ Result<Ok, const char*>
@ -4842,21 +4804,6 @@ Preferences::InitInitialObjects(bool aIsStartup)
}
}
#ifdef DEBUG
// Check that all varcache preferences match their current values. This can
// currently fail if the default value of a static varcache preference is
// changed in a preference file or at runtime, rather than in
// StaticPrefList.h.
#define PREF(name, cpp_type, value)
#define VARCACHE_PREF(name, id, cpp_type, value) \
MOZ_ASSERT(GetPref<StripAtomic<cpp_type>>(name, value) == StaticPrefs::id(), \
"Incorrect cached value for " name);
#include "mozilla/StaticPrefList.h"
#undef PREF
#undef VARCACHE_PREF
#endif
return Ok();
}