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

levin at chromium.org levin at chromium.org
Wed Dec 22 16:03:11 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2dd10b26bb1433eff6780272dffac56500b25032
Author: levin at chromium.org <levin at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 18 04:01:57 2010 +0000

    Unreviewed, rolling out r72243.
    http://trac.webkit.org/changeset/72243
    https://bugs.webkit.org/show_bug.cgi?id=49710
    
    Patch by Sheriff Bot <webkit.review.bot at gmail.com> on 2010-11-17
    Seemed to cause a large set of Chromium layout test to start
    failing. (Requested by dave_levin on #webkit).
    
    * bindings/v8/V8NPUtils.cpp:
    (WebCore::convertV8ObjectToNPVariant):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72271 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b87222f..76f009f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-17  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r72243.
+        http://trac.webkit.org/changeset/72243
+        https://bugs.webkit.org/show_bug.cgi?id=49710
+
+        Seemed to cause a large set of Chromium layout test to start
+        failing. (Requested by dave_levin on #webkit).
+
+        * bindings/v8/V8NPUtils.cpp:
+        (WebCore::convertV8ObjectToNPVariant):
+
 2010-11-17  Adam Roben  <aroben at apple.com>
 
         Fix Acid3 in Safari for Windows
diff --git a/WebCore/bindings/v8/V8NPUtils.cpp b/WebCore/bindings/v8/V8NPUtils.cpp
index 65c30a0..8fa19d7 100644
--- a/WebCore/bindings/v8/V8NPUtils.cpp
+++ b/WebCore/bindings/v8/V8NPUtils.cpp
@@ -53,7 +53,9 @@ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NP
     if (object.IsEmpty())
         return;
 
-    if (object->IsNumber())
+    if (object->IsInt32())
+        INT32_TO_NPVARIANT(object->NumberValue(), *result);
+    else if (object->IsNumber())
         DOUBLE_TO_NPVARIANT(object->NumberValue(), *result);
     else if (object->IsBoolean())
         BOOLEAN_TO_NPVARIANT(object->BooleanValue(), *result);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list