Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset e954e5a93482 (bug 1287946)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-07-21 08:07:11 +02:00
parent b79cd94740
commit d8c7234cc9
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
widget/android/PrefsHelper.h
View File

@ -12,8 +12,10 @@
#include "nsCOMPtr.h"
#include "nsVariant.h"
#include "mozilla/Maybe.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
#include "mozilla/UniquePtr.h"
namespace mozilla {
@ -66,17 +68,20 @@ class PrefsHelper
return false;
}
jni::StringParam jstrVal(type == java::PrefsHelper::PREF_STRING ?
jni::StringParam(strVal, aPrefName.Env()) :
jni::StringParam(nullptr));
Maybe<jni::StringParam> jstrVal;
jstrVal.emplace(nullptr);
if (type == java::PrefsHelper::PREF_STRING) {
jstrVal.reset();
jstrVal.emplace(strVal, aPrefName.Env());
}
if (aPrefHandler) {
java::PrefsHelper::CallPrefHandler(
aPrefHandler, type, aPrefName,
boolVal, intVal, jstrVal);
boolVal, intVal, jstrVal.ref());
} else {
java::PrefsHelper::OnPrefChange(
aPrefName, type, boolVal, intVal, jstrVal);
aPrefName, type, boolVal, intVal, jstrVal.ref());
}
return true;
}
@ -189,11 +194,16 @@ public:
continue;
}
Maybe<jni::StringParam> jstrVal;
jstrVal.emplace(nullptr);
if (type == java::PrefsHelper::PREF_STRING) {
jstrVal.reset();
jstrVal.emplace(strVal, aCls.Env());
}
java::PrefsHelper::CallPrefHandler(
aPrefHandler, type, nameStr, boolVal, intVal,
jni::StringParam(type == java::PrefsHelper::PREF_STRING ?
jni::StringParam(strVal, aCls.Env()) :
jni::StringParam(nullptr)));
aPrefHandler, type, nameStr,
boolVal, intVal, jstrVal.ref());
}
java::PrefsHelper::CallPrefHandler(
@ -313,10 +323,15 @@ public:
return;
}
Maybe<jni::StringParam> jstrVal;
jstrVal.emplace(nullptr);
if (type == java::PrefsHelper::PREF_STRING) {
jstrVal.reset();
jstrVal.emplace(strVal);
}
java::PrefsHelper::OnPrefChange(
name, type, boolVal, intVal,
jni::StringParam(type == java::PrefsHelper::PREF_STRING ?
jni::StringParam(strVal) : jni::StringParam(nullptr)));
name, type, boolVal, intVal, jstrVal.ref());
}
};

9
widget/android/jni/Refs.h
View File

@ -680,16 +680,9 @@ public:
, mEnv(env)
{}
StringParam(StringParam&& other)
: Ref(other.Get())
, mEnv(other.mEnv)
{
other.mInstance = nullptr;
}
~StringParam()
{
if (mEnv && Get()) {
if (mEnv) {
mEnv->DeleteLocalRef(Get());
}
}