corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1244875 - Update JNI usages; r=snorp

Browse Source 
Update JNI usages to match the changes in JNI templates.
This commit is contained in:
Jim Chen
2016-02-09 17:27:28 -05:00
parent 921c56c862
commit 82870a9c22
7 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
widget/android/NativeJSContainer.cpp
View File

@@ -49,8 +49,8 @@ CheckJSCall(bool result)
return result;
}
template<class C> bool
CheckJNIArgument(const jni::Ref<C>& arg)
template<class C, typename T> bool
CheckJNIArgument(const jni::Ref<C, T>& arg)
{
if (!arg) {
jni::ThrowException("java/lang/IllegalArgumentException",
@@ -246,8 +246,8 @@ class NativeJSContainerImpl final
if (!CheckJSCall(autoStr.init(mJSContext, str))) {
return nullptr;
}
// Param<String> can automatically convert a nsString to jstring.
return jni::Param<jni::String>(autoStr, mEnv);
// StringParam can automatically convert a nsString to jstring.
return jni::StringParam(autoStr, mEnv);
}
jni::String::LocalRef
@@ -374,8 +374,7 @@ class NativeJSContainerImpl final
ObjectNewArray(JS::HandleObject array, size_t length)
{
auto jarray = Prop::NativeArray::Adopt(mEnv, mEnv->NewObjectArray(
length,
jni::Accessor::EnsureClassRef<typename Prop::ClassType>(mEnv),
length, typename Prop::ClassType::Context().ClassRef(),
nullptr));
if (!jarray) {
return nullptr;
@@ -815,7 +814,7 @@ public:
JS::NullHandleValue, AppendJSON, &json))) {
return nullptr;
}
return jni::Param<jni::String>(json, mEnv);
return jni::StringParam(json, mEnv);
}
};