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

Backed out changeset 2e8206d7352e (bug 1200426) for Android Perma Failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book
2015-10-08 10:07:11 +02:00
parent 1340ec28cc
commit a71f85c019
9 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
widget/android/AndroidJavaWrappers.cpp
View File

@@ -70,6 +70,7 @@ jfieldID AndroidGeckoEvent::jGamepadButtonField = 0;
jfieldID AndroidGeckoEvent::jGamepadButtonPressedField = 0;
jfieldID AndroidGeckoEvent::jGamepadButtonValueField = 0;
jfieldID AndroidGeckoEvent::jGamepadValuesField = 0;
jfieldID AndroidGeckoEvent::jObjectField = 0;
jclass AndroidPoint::jPointClass = 0;
jfieldID AndroidPoint::jXField = 0;
@@ -177,6 +178,7 @@ AndroidGeckoEvent::InitGeckoEventClass(JNIEnv *jEnv)
jGamepadButtonPressedField = geckoEvent.getField("mGamepadButtonPressed", "Z");
jGamepadButtonValueField = geckoEvent.getField("mGamepadButtonValue", "F");
jGamepadValuesField = geckoEvent.getField("mGamepadValues", "[F");
jObjectField = geckoEvent.getField("mObject", "Ljava/lang/Object;");
}
void
@@ -471,6 +473,13 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
mMetaState = jenv->GetIntField(jobj, jMetaStateField);
break;
case PROCESS_OBJECT: {
const jobject obj = jenv->GetObjectField(jobj, jObjectField);
mObject.Init(obj, jenv);
jenv->DeleteLocalRef(obj);
break;
}
case LOCATION_EVENT: {
jobject location = jenv->GetObjectField(jobj, jLocationField);
mGeoPosition = AndroidLocation::CreateGeoPosition(jenv, location);