[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit fbb002f4a3750348cf5135a7ce148f5169c9926c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 4 21:19:20 2010 +0000

    2010-02-04  Steve Block  <steveblock at google.com>
    
            Reviewed by Nate Chapin.
    
            Fix bug in V8 convertNPVariantToJValue when converting float and double types
            https://bugs.webkit.org/show_bug.cgi?id=34593
    
            No new tests, build fix only.
    
            * bridge/jni/v8/JNIUtilityPrivate.cpp: Modified.
            (JSC::Bindings::convertNPVariantToJValue): Modified. Use correct members of 'result' enum.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2e5652b..84e6b91 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-04  Steve Block  <steveblock at google.com>
+
+        Reviewed by Nate Chapin.
+
+        Fix bug in V8 convertNPVariantToJValue when converting float and double types
+        https://bugs.webkit.org/show_bug.cgi?id=34593
+
+        No new tests, build fix only.
+
+        * bridge/jni/v8/JNIUtilityPrivate.cpp: Modified.
+        (JSC::Bindings::convertNPVariantToJValue): Modified. Use correct members of 'result' enum.
+
 2010-02-04  Chris Guillory  <chris.guillory at google.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
index 2edb192..9352983 100644
--- a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
+++ b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
@@ -134,9 +134,9 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
     case float_type:
         {
             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));
         }
@@ -145,9 +145,9 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
     case double_type:
         {
             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));
         }

-- 
WebKit Debian packaging