diff options
| -rw-r--r-- | WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp index 2edb192..38f38f6 100644 --- a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp +++ b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp @@ -133,23 +133,29 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja case float_type: { +#if PLATFORM(ANDROID) + // TODO: Upstream this fix to webkit.org if (type == NPVariantType_Int32) - result.j = static_cast<jfloat>(NPVARIANT_TO_INT32(value)); + result.f = static_cast<jfloat>(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) - result.j = static_cast<jfloat>(NPVARIANT_TO_DOUBLE(value)); + result.f = static_cast<jfloat>(NPVARIANT_TO_DOUBLE(value)); else bzero(&result, sizeof(jvalue)); +#endif } break; case double_type: { +#if PLATFORM(ANDROID) + // TODO: Upstream this fix to webkit.org if (type == NPVariantType_Int32) - result.j = static_cast<jdouble>(NPVARIANT_TO_INT32(value)); + result.d = static_cast<jdouble>(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) - result.j = static_cast<jdouble>(NPVARIANT_TO_DOUBLE(value)); + result.d = static_cast<jdouble>(NPVARIANT_TO_DOUBLE(value)); else bzero(&result, sizeof(jvalue)); +#endif } break; |