commit 77c44b2cfc952c816061d1879f13fb9aff13f1fb
author Steve Block <steveblock@google.com> Fri Feb 05 14:15:08 2010 +0000
committer Steve Block <steveblock@google.com> Fri Feb 05 14:15:08 2010 +0000
tree eb3c14e82341f851e460d2cee4c73e6c710e0df4
parent 14fdbbe4f8b7731af47530c11ed17e29234151b7

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

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 @@
 
     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;