Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-27 12:50:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1394578 - Move more operations into PrefValue. r=glandium

Browse Source 
The nice thing about this is that the memory management of the strings
(moz_xstrdup() and free()) is now entirely within PrefValue.

MozReview-Commit-ID: KJjnURpmgfE

--HG--
extra : rebase_source : 39c058cddf5ebf9e19f9151f40fd507f6909a289
This commit is contained in:
Nicholas Nethercote 2017-11-23 16:34:42 +11:00
parent 5208f7436b
commit dcfe881ca1
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
modules/libpref/Preferences.cpp
View File

@ -156,6 +156,29 @@ union PrefValue {
MOZ_CRASH("Unhandled enum value");
}
}
void Init(PrefType aNewType, PrefValue aNewValue)
{
if (aNewType == PrefType::String) {
MOZ_ASSERT(aNewValue.mStringVal);
aNewValue.mStringVal = moz_xstrdup(aNewValue.mStringVal);
}
*this = aNewValue;
}
void Clear(PrefType aType)
{
if (aType == PrefType::String) {
free(const_cast<char*>(mStringVal));
mStringVal = nullptr;
}
}
void Replace(PrefType aOldType, PrefType aNewType, PrefValue aNewValue)
{
Clear(aOldType);
Init(aNewType, aNewValue);
}
};
#ifdef DEBUG
@ -244,10 +267,8 @@ public:
// There's no need to free mName because it's allocated in memory owned by
// gPrefNameArena.
if (IsTypeString()) {
free(const_cast<char*>(mDefaultValue.mStringVal));
free(const_cast<char*>(mUserValue.mStringVal));
}
mDefaultValue.Clear(Type());
mUserValue.Clear(Type());
}
const char* Name() { return mName; }
@ -434,34 +455,6 @@ public:
}
private:
// Overwrite the type and value of an existing preference. Caller must ensure
// that they are not changing the type of a preference that has a default
// value.
void ReplaceValue(PrefValueKind aKind, PrefType aNewType, PrefValue aNewValue)
{
PrefValue* value =
aKind == PrefValueKind::Default ? &mDefaultValue : &mUserValue;
if (Type() == PrefType::String) {
free(const_cast<char*>(value->mStringVal));
}
SetType(aNewType);
if (aNewType == PrefType::String) {
MOZ_ASSERT(aNewValue.mStringVal);
value->mStringVal = moz_xstrdup(aNewValue.mStringVal);
} else {
*value = aNewValue;
}
if (aKind == PrefValueKind::Default) {
mHasDefaultValue = true;
} else {
mHasUserValue = true;
}
}
bool ValueMatches(PrefValueKind aKind, PrefType aType, PrefValue aValue)
{
return IsType(aType) &&
@ -498,7 +491,8 @@ public:
// Should we set the default value? Only if the pref is not locked, and
// doing so would change the default value.
if (!IsLocked() && !ValueMatches(PrefValueKind::Default, aType, aValue)) {
ReplaceValue(PrefValueKind::Default, aType, aValue);
mDefaultValue.Replace(Type(), aType, aValue);
mHasDefaultValue = true;
if (aIsSticky) {
mIsSticky = true;
}
@ -531,7 +525,9 @@ public:
// Otherwise, should we set the user value? Only if doing so would
// change the user value.
} else if (!ValueMatches(PrefValueKind::User, aType, aValue)) {
ReplaceValue(PrefValueKind::User, aType, aValue);
mUserValue.Replace(Type(), aType, aValue);
SetType(aType); // needed because we may have changed the type
mHasUserValue = true;
if (!IsLocked()) {
*aDirty = true;
*aValueChanged = true;