Back out a change that was incorrectly committed yesterday.

        Reviewed by Chris.

        * bindings/objc/objc_utility.mm:
        (KJS::Bindings::convertValueToObjcValue):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8397 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index a5516bc48cf54c8071babc946414c1cc5b36ad32..132fa0ba21c58c827a5c0ace39031b6a9d208b7b 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-18  Richard Williamson   <rjw@apple.com>
+
+       Back out a change that was incorrectly committed yesterday.
+
+        Reviewed by Chris.
+
+        * bindings/objc/objc_utility.mm:
+        (KJS::Bindings::convertValueToObjcValue):
+
 2005-01-17  Richard Williamson   <rjw@apple.com>
 
        Fixed <rdar://problem/3753030> Need to ensure same origin for plugin binding invocations (origin security rules)

diff --git a/JavaScriptCore/bindings/objc/objc_utility.mm b/JavaScriptCore/bindings/objc/objc_utility.mm
index 85e7cdab40b3487600836e7fdd2385ea77d9ee55..f1bd71c8eec4aa996ac312e7d8b46415a347f3c8 100644 (file)
--- a/JavaScriptCore/bindings/objc/objc_utility.mm
+++ b/JavaScriptCore/bindings/objc/objc_utility.mm
@@ -92,7 +92,7 @@ ObjcValue KJS::Bindings::convertValueToObjcValue (KJS::ExecState *exec, const KJ
     ObjcValue result;
     double d = 0;
    
-    if (!ObjcObjectType)
+    if (value.type() == NumberType || value.type() == StringType)
        d = value.toNumber(exec);
        
     switch (type){