diff options
| author | Steve Block <steveblock@google.com> | 2011-08-08 17:48:18 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-08-08 17:49:26 +0100 |
| commit | 1b90d74d66fbb55d40e5e87a84423acd81ab062a (patch) | |
| tree | 531212cdbd343290cf947d0e9fb85c5daf0acc7e /Source/WebKit | |
| parent | 6b9d05281a529f9cd3e527fb8d657b338bb4fd7a (diff) | |
| download | external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.zip external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.tar.gz external_webkit-1b90d74d66fbb55d40e5e87a84423acd81ab062a.tar.bz2 | |
Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty()
Bug: 5006441
Change-Id: I2da7a6f626560416cf5cac0cde3193a9074fab0f
Diffstat (limited to 'Source/WebKit')
| -rw-r--r-- | Source/WebKit/android/jni/WebCoreFrameBridge.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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 |