summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-01-08 09:15:31 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-08 09:15:31 -0800
commitee0e4a35152a822ebac039808db1a4c33f02f7ee (patch)
treeee64aa110c91adb70d51dabe7a3c42470f4bd007 /WebCore
parent5cf18d3a4942dd7fba1f03621d53d66412b1b3df (diff)
parent88d4517612dafdcaff7a98f2a68ff071e2734ea6 (diff)
downloadexternal_webkit-ee0e4a35152a822ebac039808db1a4c33f02f7ee.zip
external_webkit-ee0e4a35152a822ebac039808db1a4c33f02f7ee.tar.gz
external_webkit-ee0e4a35152a822ebac039808db1a4c33f02f7ee.tar.bz2
Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/bridge/jni/v8/jni_utility_private.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/bridge/jni/v8/jni_utility_private.cpp b/WebCore/bridge/jni/v8/jni_utility_private.cpp
index c58472e..6c8f018 100644
--- a/WebCore/bridge/jni/v8/jni_utility_private.cpp
+++ b/WebCore/bridge/jni/v8/jni_utility_private.cpp
@@ -48,7 +48,7 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
if (type == NPVariantType_Object) {
NPObject* objectImp = NPVARIANT_TO_OBJECT(value);
if (JavaInstance* instance = ExtractJavaInstance(objectImp))
- result.l = instance->getLocalRef();
+ result.l = instance->javaInstance();
}
// Now convert value to a string if the target type is a java.lang.string, and we're not