commit 939d1819c550af9e179aa2fa46668206333e1ebc
author Patrick Scott <phanna@android.com> Thu Jul 01 04:59:04 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 01 04:59:04 2010 -0700
tree cac8392574053a68c9ad2edcfac4f54ca98afa6f
parent 5a1f66aac4d3f0a1023c62f156bb698ef3832284
parent 9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be

am 9d4701f9: Push a local reference frame to avoid table overflow.

Merge commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread

* commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be':
  Push a local reference frame to avoid table overflow.

WebCore/bridge/jni/v8/JavaInstanceV8.cpp

diff --git a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
index 3a2cb8b..59aa104 100644
--- a/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
+++ b/WebCore/bridge/jni/v8/JavaInstanceV8.cpp
@@ -32,14 +32,9 @@
 #include "JavaClassV8.h"
 
 #include <assert.h>
-#include <utils/Log.h>
 
 #define LOG_TAG "v8binding"
-
-// ANDROID
-#include <cutils/log.h>
-#define LOG_TAG JavaInstanceV8.cpp
-// END ANDROID
+#include <utils/Log.h>
 
 using namespace JSC::Bindings;
 
@@ -55,6 +50,16 @@
     delete m_class;
 }
 
+#define NUM_LOCAL_REFS 64
+
+void JavaInstance::virtualBegin() {
+    getJNIEnv()->PushLocalFrame(NUM_LOCAL_REFS);
+}
+
+void JavaInstance::virtualEnd() {
+    getJNIEnv()->PopLocalFrame(0);
+}
+
 JavaClass* JavaInstance::getClass() const
 {
     if (!m_class)

WebCore/bridge/jni/v8/JavaInstanceV8.h

diff --git a/WebCore/bridge/jni/v8/JavaInstanceV8.h b/WebCore/bridge/jni/v8/JavaInstanceV8.h
index c928c05..4f009a5 100644
--- a/WebCore/bridge/jni/v8/JavaInstanceV8.h
+++ b/WebCore/bridge/jni/v8/JavaInstanceV8.h
@@ -89,8 +89,8 @@
     RefPtr<JObjectWrapper> m_instance;
     mutable JavaClass* m_class;
 
-    virtual void virtualBegin() {}
-    virtual void virtualEnd() {}
+    virtual void virtualBegin();
+    virtual void virtualEnd();
 };
 
 } // namespace Bindings