diff options
| author | Steve Block <steveblock@google.com> | 2010-01-08 09:18:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-01-08 09:18:06 -0800 |
| commit | 43342a276dcdb9e1f8c677f5077d151cd5d6ad07 (patch) | |
| tree | ee64aa110c91adb70d51dabe7a3c42470f4bd007 /WebCore | |
| parent | dd9c60d0c71b85e87676f43d262ee722357e9f63 (diff) | |
| parent | ee0e4a35152a822ebac039808db1a4c33f02f7ee (diff) | |
| download | external_webkit-43342a276dcdb9e1f8c677f5077d151cd5d6ad07.zip external_webkit-43342a276dcdb9e1f8c677f5077d151cd5d6ad07.tar.gz external_webkit-43342a276dcdb9e1f8c677f5077d151cd5d6ad07.tar.bz2 | |
am ee0e4a35: Merge "Updates the use of weak references in the script-to-Java bridge for V8." into eclair-mr2
Merge commit 'ee0e4a35152a822ebac039808db1a4c33f02f7ee' into eclair-mr2-plus-aosp
* commit 'ee0e4a35152a822ebac039808db1a4c33f02f7ee':
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 |