Backout changeset c1161ca4bf13

widget/android/AndroidJavaWrappers.cpp

@@ -76,8 +76,6 @@ jfieldID AndroidGeckoEvent::jLocationField = 0;
 jfieldID AndroidGeckoEvent::jAddressField = 0;
 jfieldID AndroidGeckoEvent::jBandwidthField = 0;
 jfieldID AndroidGeckoEvent::jCanBeMeteredField = 0;
-jfieldID AndroidGeckoEvent::jTabIdField = 0;
-jmethodID AndroidGeckoEvent::jDoCallbackMethod = 0;
 
 jclass AndroidPoint::jPointClass = 0;
 jfieldID AndroidPoint::jXField = 0;
@@ -210,9 +208,6 @@ AndroidGeckoEvent::InitGeckoEventClass(JNIEnv *jEnv)
     jAddressField = getField("mAddress", "Landroid/location/Address;");
     jBandwidthField = getField("mBandwidth", "D");
     jCanBeMeteredField = getField("mCanBeMetered", "Z");
-
-    jTabIdField = getField("mTabId", "I");
-    jDoCallbackMethod = getMethod("doCallback", "(Ljava/lang/String;)V");
 }
 
 void
@@ -590,10 +585,6 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
             break;
         }
 
-        case META_VIEWPORT_QUERY:
-            mTabId = jenv->GetIntField(jobj, jTabIdField);
-            break;
-
         case VIEWPORT:
         case BROADCAST: {
             ReadCharactersField(jenv);
@@ -625,6 +616,11 @@ AndroidGeckoEvent::Init(JNIEnv *jenv, jobject jobj)
             break;
         }
 
+        case SCREENSHOT: {
+            mMetaState = jenv->GetIntField(jobj, jMetaStateField);
+            ReadPointArray(mPoints, jenv, jPoints, 2);
+        }
+
         default:
             break;
     }
@@ -669,15 +665,6 @@ AndroidPoint::Init(JNIEnv *jenv, jobject jobj)
     }
 }
 
-void
-AndroidGeckoEvent::DoCallback(const nsAString& data) {
-    JNIEnv* env = AndroidBridge::GetJNIEnv();
-    if (!env)
-        return;
-    jstring jData = env->NewString(nsPromiseFlatString(data).get(), data.Length());
-    env->CallVoidMethod(wrapped_obj, jDoCallbackMethod, jData);
-}
-
 void
 AndroidGeckoGLLayerClient::Init(jobject jobj)
 {