diff options
| author | Steve Block <steveblock@google.com> | 2011-08-10 09:27:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-10 09:27:16 -0700 |
| commit | fe1799574525deb3c8b300d8854a9d1fd2ff3639 (patch) | |
| tree | dd138167989105614bd59d7ab5093e815afdbb87 /Source/WebKit | |
| parent | 5c403a0d2cc6f6936b56beeb5f601fe21e837254 (diff) | |
| parent | 1b90d74d66fbb55d40e5e87a84423acd81ab062a (diff) | |
| download | external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.zip external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.tar.gz external_webkit-fe1799574525deb3c8b300d8854a9d1fd2ff3639.tar.bz2 | |
Merge "Add missing calls to JavaInstance::end() in JavaNPObjectInvoke() and JavaNPObjectGetProperty()"
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 6a1a19f..a7f3897 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 |