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

Remove unused parameters passed to endDrawing

Browse Source
This commit is contained in:
Kartikaya Gupta
2012-02-24 12:11:29 -05:00
parent e8983883c4
commit eb0c3d23f3
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/android/base/gfx/GeckoLayerClient.java
View File

@@ -203,19 +203,15 @@ public class GeckoLayerClient implements GeckoEventListener,
return bufferRect; return bufferRect;
} }
/** This function is invoked by Gecko via JNI; be careful when modifying signature. /** This function is invoked by Gecko via JNI; be careful when modifying signature. */
* public void endDrawing() {
* 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) {
updateViewport(!mUpdateViewportOnEndDraw); updateViewport(!mUpdateViewportOnEndDraw);
mUpdateViewportOnEndDraw = false; mUpdateViewportOnEndDraw = false;
Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing"); Log.i(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - endDrawing");
/* Used by robocop for testing purposes */ /* Used by robocop for testing purposes */
if (mDrawListener != null) { 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. */ /** Used by robocop for testing purposes. Not for production use! This is used via reflection by robocop. */
public interface DrawListener { public interface DrawListener {
public void drawFinished(int x, int y, int width, int height); public void drawFinished();
} }
} }

7
widget/android/AndroidJavaWrappers.cpp
View File

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

2
widget/android/AndroidJavaWrappers.h
View File

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

2
widget/android/nsWindow.cpp
View File

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