diff options
| author | Steve Block <steveblock@google.com> | 2010-02-05 14:15:08 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-05 14:15:08 +0000 |
| commit | 77c44b2cfc952c816061d1879f13fb9aff13f1fb (patch) | |
| tree | eb3c14e82341f851e460d2cee4c73e6c710e0df4 /WebCore | |
| parent | 14fdbbe4f8b7731af47530c11ed17e29234151b7 (diff) | |
| download | external_webkit-77c44b2cfc952c816061d1879f13fb9aff13f1fb.zip external_webkit-77c44b2cfc952c816061d1879f13fb9aff13f1fb.tar.gz external_webkit-77c44b2cfc952c816061d1879f13fb9aff13f1fb.tar.bz2 | |
Update fix in convertNPVariantToJValue to reflect final version submitted to webkit.org
See http://trac.webkit.org/changeset/54366
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp | 6 |
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; |