Bug 1288821 - Remove observer events in GeckoEvent; r=snorp
Remove the now-obsolete CALL_OBSERVER and REMOVE_OBSERVER events from GeckoEvent, along with the native-only event ADD_OBSERVER.
This commit is contained in:
@@ -29,7 +29,6 @@ jfieldID AndroidGeckoEvent::jXField = 0;
|
||||
|
||||
jfieldID AndroidGeckoEvent::jCharactersField = 0;
|
||||
jfieldID AndroidGeckoEvent::jCharactersExtraField = 0;
|
||||
jfieldID AndroidGeckoEvent::jDataField = 0;
|
||||
jfieldID AndroidGeckoEvent::jMetaStateField = 0;
|
||||
jfieldID AndroidGeckoEvent::jCountField = 0;
|
||||
jfieldID AndroidGeckoEvent::jPointerIndexField = 0;
|
||||
@@ -84,7 +83,6 @@ AndroidGeckoEvent::InitGeckoEventClass(JNIEnv *jEnv)
|
||||
|
||||
jCharactersField = geckoEvent.getField("mCharacters", "Ljava/lang/String;");
|
||||
jCharactersExtraField = geckoEvent.getField("mCharactersExtra", "Ljava/lang/String;");
|
||||
jDataField = geckoEvent.getField("mData", "Ljava/lang/String;");
|
||||
jMetaStateField = geckoEvent.getField("mMetaState", "I");
|
||||
jCountField = geckoEvent.getField("mCount", "I");
|
||||
jPointerIndexField = geckoEvent.getField("mPointerIndex", "I");
|
||||
@@ -211,13 +209,6 @@ AndroidGeckoEvent::ReadCharactersExtraField(JNIEnv *jenv)
|
||||
ReadStringFromJString(mCharactersExtra, jenv, s);
|
||||
}
|
||||
|
||||
void
|
||||
AndroidGeckoEvent::ReadDataField(JNIEnv *jenv)
|
||||
{
|
||||
jstring s = (jstring) jenv->GetObjectField(wrapped_obj, jDataField);
|
||||
ReadStringFromJString(mData, jenv, s);
|
||||
}
|
||||
|
||||
void
|
||||
AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
|
||||
{
|
||||
@@ -263,18 +254,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
|
||||
break;
|
||||
}
|
||||
|
||||
case CALL_OBSERVER: {
|
||||
ReadCharactersField(jenv);
|
||||
ReadCharactersExtraField(jenv);
|
||||
ReadDataField(jenv);
|
||||
break;
|
||||
}
|
||||
|
||||
case REMOVE_OBSERVER: {
|
||||
ReadCharactersField(jenv);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user