wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 987281 - Refactor AutoLocalJNIFrame. r=blassey

Browse Source
This commit is contained in:
Jim Chen 2014-03-25 12:02:43 -04:00
parent cc0d0bda5a
commit d4ef8ed53c
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
widget/android/AndroidBridge.h
View File

@ -488,29 +488,27 @@ private:
class AutoLocalJNIFrame {
public:
AutoLocalJNIFrame(int nEntries = 128)
: mEntries(nEntries), mHasFrameBeenPushed(false)
AutoLocalJNIFrame(int nEntries = 15)
: mEntries(nEntries)
, mJNIEnv(AndroidBridge::GetJNIEnv())
, mHasFrameBeenPushed(false)
{
mJNIEnv = AndroidBridge::GetJNIEnv();
MOZ_ASSERT(mJNIEnv);
Push();
}
AutoLocalJNIFrame(JNIEnv* aJNIEnv, int nEntries = 128)
: mEntries(nEntries), mHasFrameBeenPushed(false)
AutoLocalJNIFrame(JNIEnv* aJNIEnv, int nEntries = 15)
: mEntries(nEntries)
, mJNIEnv(aJNIEnv ? aJNIEnv : AndroidBridge::GetJNIEnv())
, mHasFrameBeenPushed(false)
{
mJNIEnv = aJNIEnv ? aJNIEnv : AndroidBridge::GetJNIEnv();
MOZ_ASSERT(mJNIEnv);
Push();
}
// Note! Calling Purge makes all previous local refs created in
// the AutoLocalJNIFrame's scope INVALID; be sure that you locked down
// any local refs that you need to keep around in global refs!
void Purge() {
if (mJNIEnv) {
if (mHasFrameBeenPushed)
mJNIEnv->PopLocalFrame(nullptr);
Push();
~AutoLocalJNIFrame() {
if (mHasFrameBeenPushed) {
Pop();
}
}
@ -520,42 +518,43 @@ public:
bool CheckForException() {
if (mJNIEnv->ExceptionCheck()) {
mJNIEnv->ExceptionDescribe();
mJNIEnv->ExceptionClear();
AndroidBridge::HandleUncaughtException(mJNIEnv);
return true;
}
return false;
}
~AutoLocalJNIFrame() {
if (!mJNIEnv)
return;
// Note! Calling Purge makes all previous local refs created in
// the AutoLocalJNIFrame's scope INVALID; be sure that you locked down
// any local refs that you need to keep around in global refs!
void Purge() {
Pop();
Push();
}
CheckForException();
if (mHasFrameBeenPushed)
mJNIEnv->PopLocalFrame(nullptr);
template <typename ReturnType = jobject>
ReturnType Pop(ReturnType aResult = nullptr) {
MOZ_ASSERT(mHasFrameBeenPushed);
mHasFrameBeenPushed = false;
return static_cast<ReturnType>(
mJNIEnv->PopLocalFrame(static_cast<jobject>(aResult)));
}
private:
void Push() {
if (!mJNIEnv)
return;
MOZ_ASSERT(!mHasFrameBeenPushed);
// Make sure there is enough space to store a local ref to the
// exception. I am not completely sure this is needed, but does
// not hurt.
jint ret = mJNIEnv->PushLocalFrame(mEntries + 1);
NS_ABORT_IF_FALSE(ret == 0, "Failed to push local JNI frame");
if (ret < 0)
if (mJNIEnv->PushLocalFrame(mEntries + 1) != 0) {
CheckForException();
else
mHasFrameBeenPushed = true;
return;
}
mHasFrameBeenPushed = true;
}
int mEntries;
JNIEnv* mJNIEnv;
const int mEntries;
JNIEnv* const mJNIEnv;
bool mHasFrameBeenPushed;
};