From 1b90d74d66fbb55d40e5e87a84423acd81ab062a Mon Sep 17 00:00:00 2001 From: Steve Block Date: Mon, 8 Aug 2011 17:48:18 +0100 Subject: Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty() Bug: 5006441 Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f --- Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'Source/WebKit') diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp index c08e629..a059bbe 100644 --- a/Source/WebKit/android/jni/WebCoreFrameBridge.cpp +++ b/Source/WebKit/android/jni/WebCoreFrameBridge.cpp @@ -1799,10 +1799,7 @@ private: } ~WeakJavaInstance() { - // TODO: Check whether it's OK for calls to begin() and end() to be unbalanced. - // See b/5006441 - if (m_beginEndDepth) - LOGW("Unbalanced calls to WeakJavaInstance::begin() / end()"); + LOG_ASSERT(!m_beginEndDepth, "Unbalanced calls to WeakJavaInstance::begin() / end()"); JNIEnv* env = getJNIEnv(); // The JavaInstance destructor attempts to delete the global ref stored // in m_instance. Since we replaced it in our constructor with a weak -- cgit v1.1