diff options
| author | Selim Gurun <sgurun@google.com> | 2012-10-09 21:34:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-09 21:34:27 -0700 |
| commit | d60f8336f254dab10ab029b654ff092eba5c3d3b (patch) | |
| tree | e911572531f9e43423b5c84da34530879cedc17d /Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | |
| parent | 43e94fa8daa7eaaece0da98e14809891b3fd2b4c (diff) | |
| parent | 66ad15e4f5452b9275777e9284b3369cde8aa306 (diff) | |
| download | external_webkit-d60f8336f254dab10ab029b654ff092eba5c3d3b.zip external_webkit-d60f8336f254dab10ab029b654ff092eba5c3d3b.tar.gz external_webkit-d60f8336f254dab10ab029b654ff092eba5c3d3b.tar.bz2 | |
am 66ad15e4: DO NOT MERGE Control access to inherited methods of jsinterface objects
* commit '66ad15e4f5452b9275777e9284b3369cde8aa306':
DO NOT MERGE Control access to inherited methods of jsinterface objects
Diffstat (limited to 'Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp')
| -rw-r--r-- | Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp index 15b4bda..c6e0a6c 100644 --- a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp +++ b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp @@ -206,7 +206,7 @@ JavaValue convertNPVariantToJavaValue(NPVariant value, const String& javaClass) break; } - result.m_objectValue = adoptRef(new JavaInstanceJobject(javaArray)); + result.m_objectValue = adoptRef(new JavaInstanceJobject(javaArray, false)); env->DeleteLocalRef(javaArray); } break; @@ -421,7 +421,11 @@ void convertJavaValueToNPVariant(JavaValue value, NPVariant* result) } } +#if PLATFORM(ANDROID) +JavaValue jvalueToJavaValue(const jvalue& value, const JavaType& type, bool requireAnnotation) +#else JavaValue jvalueToJavaValue(const jvalue& value, const JavaType& type) +#endif { JavaValue result; result.m_type = type; @@ -429,7 +433,11 @@ JavaValue jvalueToJavaValue(const jvalue& value, const JavaType& type) case JavaTypeVoid: break; case JavaTypeObject: +#if PLATFORM(ANDROID) + result.m_objectValue = new JavaInstanceJobject(value.l, requireAnnotation); +#else result.m_objectValue = new JavaInstanceJobject(value.l); +#endif break; case JavaTypeString: { |