Merge fixes

2012-02-08 19:01:21 -05:00
parent db6e6f7a54
commit 58c066d245
5 changed files with 10 additions and 38 deletions
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -808,6 +808,7 @@ AndroidGeckoSoftwareLayerClient::BeginDrawing(int aWidth, int aHeight, int aTile

 void
 AndroidGeckoSoftwareLayerClient::EndDrawing(const nsIntRect &aRect)
+{
    NS_ASSERTION(!isNull(), "EndDrawing() called on null software layer client!");

    JNIEnv *env = AndroidBridge::GetJNIEnv();