summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-10 03:51:54 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-10 03:51:54 -0800
commitd699f768cc84aa8a94faf24e39d8583700b4977d (patch)
treeb0700d58a7f86292eae3ba686bd957d194ee09b9
parent148635ccd5a4f48adad3295bc5a50029dcaa77b4 (diff)
parent77c44b2cfc952c816061d1879f13fb9aff13f1fb (diff)
downloadexternal_webkit-d699f768cc84aa8a94faf24e39d8583700b4977d.zip
external_webkit-d699f768cc84aa8a94faf24e39d8583700b4977d.tar.gz
external_webkit-d699f768cc84aa8a94faf24e39d8583700b4977d.tar.bz2
Merge "Update fix in convertNPVariantToJValue to reflect final version submitted to webkit.org"
-rw-r--r--WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp6
1 files changed, 0 insertions, 6 deletions
diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
index 38f38f6..9352983 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<jfloat>(NPVARIANT_TO_INT32(value));
else if (type == NPVariantType_Double)
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.d = static_cast<jdouble>(NPVARIANT_TO_INT32(value));
else if (type == NPVariantType_Double)
result.d = static_cast<jdouble>(NPVARIANT_TO_DOUBLE(value));
else
bzero(&result, sizeof(jvalue));
-#endif
}
break;