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

[tony at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 767001c9fcac90d88dbc1f053d820806d5b39096
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 17 22:16:26 2010 +0000

    2010-11-17  Tony Chang  <tony at chromium.org>
    
            Reviewed by Adam Barth.
    
            [chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
            https://bugs.webkit.org/show_bug.cgi?id=49036
    
            No new tests: Covered by plugins/npruntime/get-int-identifier-special-values.html
    
            In http://codereview.chromium.org/11574, the forked chromium test
            plugin changed how it testGetIntIdentifier to work around a change
            caused by a silverlight specific plugin fix:
            http://codereview.chromium.org/11569/diff/1/2
    
            It's not clear to me that this change is needed anymore since
            silverlight has had multiple releases, testing without this patch
            works on a test windows build, and safari win seems to run silverlight
            without this either.  Since there's no test for this behavior, I'm
            rolling it out so we can match the upstream test.
    
            * bindings/v8/V8NPUtils.cpp:
            (WebCore::convertV8ObjectToNPVariant):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ebc620f..287c7c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2010-11-17  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        [chromium] fix get-int-identifier-special-values.html using TestNetscapePlugIn
+        https://bugs.webkit.org/show_bug.cgi?id=49036
+
+        No new tests: Covered by plugins/npruntime/get-int-identifier-special-values.html
+
+        In http://codereview.chromium.org/11574, the forked chromium test
+        plugin changed how it testGetIntIdentifier to work around a change
+        caused by a silverlight specific plugin fix:
+        http://codereview.chromium.org/11569/diff/1/2
+
+        It's not clear to me that this change is needed anymore since
+        silverlight has had multiple releases, testing without this patch
+        works on a test windows build, and safari win seems to run silverlight
+        without this either.  Since there's no test for this behavior, I'm
+        rolling it out so we can match the upstream test.
+
+        * bindings/v8/V8NPUtils.cpp:
+        (WebCore::convertV8ObjectToNPVariant):
+
 2010-11-17  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/bindings/v8/V8NPUtils.cpp b/WebCore/bindings/v8/V8NPUtils.cpp
index 8fa19d7..65c30a0 100644
--- a/WebCore/bindings/v8/V8NPUtils.cpp
+++ b/WebCore/bindings/v8/V8NPUtils.cpp
@@ -53,9 +53,7 @@ void convertV8ObjectToNPVariant(v8::Local<v8::Value> object, NPObject* owner, NP
     if (object.IsEmpty())
         return;
 
-    if (object->IsInt32())
-        INT32_TO_NPVARIANT(object->NumberValue(), *result);
-    else if (object->IsNumber())
+    if (object->IsNumber())
         DOUBLE_TO_NPVARIANT(object->NumberValue(), *result);
     else if (object->IsBoolean())
         BOOLEAN_TO_NPVARIANT(object->BooleanValue(), *result);

-- 
WebKit Debian packaging