diff options
| author | Steve Block <steveblock@google.com> | 2010-01-08 09:26:04 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-08 09:26:04 -0800 |
| commit | 201cb71276abda07e3ac4e0bf8bc1f8966a24757 (patch) | |
| tree | be5bcae8da862d9bb12b098c8293efe731e20dc4 /WebCore | |
| parent | c66c766ebc0111a3e4dd459b418c779599c3a7ac (diff) | |
| parent | 43342a276dcdb9e1f8c677f5077d151cd5d6ad07 (diff) | |
| download | external_webkit-201cb71276abda07e3ac4e0bf8bc1f8966a24757.zip external_webkit-201cb71276abda07e3ac4e0bf8bc1f8966a24757.tar.gz external_webkit-201cb71276abda07e3ac4e0bf8bc1f8966a24757.tar.bz2 | |
am 43342a27: am ee0e4a35: Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Merge commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07'
* commit '43342a276dcdb9e1f8c677f5077d151cd5d6ad07':
Updates the use of weak references in the script-to-Java bridge for V8.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bridge/jni/v8/jni_utility_private.cpp | 2 |
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 |