[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e38b3c808a3d2ae83c71f5f548c56539773752c8
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 17 21:24:43 2010 +0000

    2010-12-17  Shimeng (Simon) Wang  <swang at google.com>
    
            Reviewed by Steve Block.
    
            Fix V8 JNI binding.
            https://bugs.webkit.org/show_bug.cgi?id=51156
    
            There're LayoutTests in:
            http://trac.webkit.org/browser/trunk/LayoutTests/java/lc3/JSNumber
            to exercise these code paths.
            Though Chromium don't run them.
            Tested on Android fast/events/touch tests.
    
            * bridge/jni/v8/JNIUtilityPrivate.cpp:
            (JSC::Bindings::convertNPVariantToJValue):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74288 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f38d77e..3816965 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-12-17  Shimeng (Simon) Wang  <swang at google.com>
+
+        Reviewed by Steve Block.
+
+        Fix V8 JNI binding.
+        https://bugs.webkit.org/show_bug.cgi?id=51156
+
+        There're LayoutTests in:
+        http://trac.webkit.org/browser/trunk/LayoutTests/java/lc3/JSNumber
+        to exercise these code paths.
+        Though Chromium don't run them.
+        Tested on Android fast/events/touch tests.
+
+        * bridge/jni/v8/JNIUtilityPrivate.cpp:
+        (JSC::Bindings::convertNPVariantToJValue):
+
 2010-12-17  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Chris Marrin.
diff --git a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
index 1bdae53..ff27009 100644
--- a/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
+++ b/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp
@@ -87,7 +87,9 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
     case byte_type:
         {
             if (type == NPVariantType_Int32)
-                result.b = static_cast<char>(NPVARIANT_TO_INT32(value));
+                result.b = static_cast<jbyte>(NPVARIANT_TO_INT32(value));
+            else if (type == NPVariantType_Double)
+                result.b = static_cast<jbyte>(NPVARIANT_TO_DOUBLE(value));
             else
                 memset(&result, 0, sizeof(jvalue));
         }
@@ -106,6 +108,8 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
         {
             if (type == NPVariantType_Int32)
                 result.s = static_cast<jshort>(NPVARIANT_TO_INT32(value));
+            else if (type == NPVariantType_Double)
+                result.s = static_cast<jshort>(NPVARIANT_TO_DOUBLE(value));
             else
                 memset(&result, 0, sizeof(jvalue));
         }
@@ -115,6 +119,8 @@ jvalue convertNPVariantToJValue(NPVariant value, JNIType jniType, const char* ja
         {
             if (type == NPVariantType_Int32)
                 result.i = static_cast<jint>(NPVARIANT_TO_INT32(value));
+            else if (type == NPVariantType_Double)
+                result.i = static_cast<jint>(NPVARIANT_TO_DOUBLE(value));
             else
                 memset(&result, 0, sizeof(jvalue));
         }

-- 
WebKit Debian packaging