Remove unused parameters passed to endDrawing

mobile/android/base/gfx/GeckoLayerClient.java

@@ -203,19 +203,15 @@ public class GeckoLayerClient implements GeckoEventListener,
         return bufferRect;
     }
 
-    /** This function is invoked by Gecko via JNI; be careful when modifying signature.
-     *
-     * TODO: Would be cleaner if this took an android.graphics.Rect instead, but that would require
-     * a little more JNI magic.
-     */
-    public void endDrawing(int x, int y, int width, int height) {
+    /** This function is invoked by Gecko via JNI; be careful when modifying signature. */
+    public void endDrawing() {
         updateViewport(!mUpdateViewportOnEndDraw);
         mUpdateViewportOnEndDraw = false;
         Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing");
 
         /* Used by robocop for testing purposes */
         if (mDrawListener != null) {
-            mDrawListener.drawFinished(x, y, width, height);
+            mDrawListener.drawFinished();
         }
     }
 
@@ -486,7 +482,7 @@ public class GeckoLayerClient implements GeckoEventListener,
 
     /** Used by robocop for testing purposes. Not for production use! This is used via reflection by robocop. */
     public interface DrawListener {
-        public void drawFinished(int x, int y, int width, int height);
+        public void drawFinished();
     }
 }
 

widget/android/AndroidJavaWrappers.cpp

@@ -348,7 +348,7 @@ AndroidGeckoLayerClient::InitGeckoLayerClientClass(JNIEnv *jEnv)
     jGeckoLayerClientClass = getClassGlobalRef("org/mozilla/gecko/gfx/GeckoLayerClient");
 
     jBeginDrawingMethod = getMethod("beginDrawing", "(IILjava/lang/String;)Landroid/graphics/Rect;");
-    jEndDrawingMethod = getMethod("endDrawing", "(IIII)V");
+    jEndDrawingMethod = getMethod("endDrawing", "()V");
     jGetViewTransformMethod = getMethod("getViewTransform",
                                         "()Lorg/mozilla/gecko/gfx/ViewTransform;");
     jCreateFrameMethod = getMethod("createFrame", "()Lorg/mozilla/gecko/gfx/LayerRenderer$Frame;");
@@ -790,7 +790,7 @@ AndroidGeckoLayerClient::BeginDrawing(int aWidth, int aHeight, nsIntRect &aDirty
 }
 
 void
-AndroidGeckoLayerClient::EndDrawing(const nsIntRect &aRect)
+AndroidGeckoLayerClient::EndDrawing()
 {
     NS_ASSERTION(!isNull(), "EndDrawing() called on null layer client!");
     JNIEnv *env = AndroidBridge::GetJNIEnv();
@@ -798,8 +798,7 @@ AndroidGeckoLayerClient::EndDrawing(const nsIntRect &aRect)
         return;
 
     AndroidBridge::AutoLocalJNIFrame(env, 1);
-    return env->CallVoidMethod(wrapped_obj, jEndDrawingMethod, aRect.x, aRect.y, aRect.width,
-                               aRect.height);
+    return env->CallVoidMethod(wrapped_obj, jEndDrawingMethod);
 }
 
 jobject

widget/android/AndroidJavaWrappers.h

@@ -225,7 +225,7 @@ public:
     : mViewTransformGetter(*this) { Init(jobj); }
 
     bool BeginDrawing(int aWidth, int aHeight, nsIntRect &aDirtyRect, const nsAString &aMetadata);
-    void EndDrawing(const nsIntRect &aRect);
+    void EndDrawing();
     void GetViewTransform(AndroidViewTransform& aViewTransform);
     void CreateFrame(AndroidLayerRendererFrame& aFrame);
     void ActivateProgram();

widget/android/nsWindow.cpp

@@ -1227,7 +1227,7 @@ nsWindow::OnDraw(AndroidGeckoEvent *ae)
     }
 
     __android_log_print(ANDROID_LOG_ERROR, "Gecko", "### Calling EndDrawing()!");
-    client.EndDrawing(dirtyRect);
+    client.EndDrawing();
     return;
 #endif