diff options
| author | Selim Gurun <sgurun@google.com> | 2012-09-04 16:31:02 -0700 |
|---|---|---|
| committer | Selim Gurun <sgurun@google.com> | 2012-10-08 14:11:06 -0700 |
| commit | 66ad15e4f5452b9275777e9284b3369cde8aa306 (patch) | |
| tree | ac6feeb9190793a53e1e3740f44afa5877a69dbf /Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h | |
| parent | 465864a6d72a2505b7a725ddaadfff05cdece8fc (diff) | |
| download | external_webkit-66ad15e4f5452b9275777e9284b3369cde8aa306.zip external_webkit-66ad15e4f5452b9275777e9284b3369cde8aa306.tar.gz external_webkit-66ad15e4f5452b9275777e9284b3369cde8aa306.tar.bz2 | |
DO NOT MERGE Control access to inherited methods of jsinterface objects
Bug: 7073422
Use a flag and annotation for allowing access to inherited methods of
jsinterface objects. When flag is false, no annotation is needed. When
flag is true, annotation is needed for allowing access to inherited methods.
Clean cherry pick of f2d8c5bed31609d7d6e3ae77f33e90ea7f888eb3
Change-Id: I226ef92e75df49293f6543abfcd17895abe76adc
Diffstat (limited to 'Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h')
| -rw-r--r-- | Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h index 0282904..47ee45a 100644 --- a/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h +++ b/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h @@ -41,7 +41,11 @@ class JavaValue; JavaValue convertNPVariantToJavaValue(NPVariant, const String& javaClass); void convertJavaValueToNPVariant(JavaValue, NPVariant*); +#if PLATFORM(ANDROID) +JavaValue jvalueToJavaValue(const jvalue&, const JavaType&, bool requireAnnotation); +#else JavaValue jvalueToJavaValue(const jvalue&, const JavaType&); +#endif jvalue javaValueToJvalue(const JavaValue&); } // namespace Bindings |