From 77c44b2cfc952c816061d1879f13fb9aff13f1fb Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 5 Feb 2010 14:15:08 +0000 Subject: [PATCH] Update fix in convertNPVariantToJValue to reflect final version submitted to webkit.org See http://trac.webkit.org/changeset/54366 --- WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp index 38f38f69f..93529830d 100644 --- a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp +++ b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp @@ -133,29 +133,23 @@ 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.f = static_cast(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) result.f = static_cast(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.d = static_cast(NPVARIANT_TO_INT32(value)); else if (type == NPVariantType_Double) result.d = static_cast(NPVARIANT_TO_DOUBLE(value)); else bzero(&result, sizeof(jvalue)); -#endif } break; -- 2.11.0