Fixed <rdar://problem/3861257> WebUndefined should be returned for undefined...

        Reviewed by John.

        * ChangeLog:
        * bindings/objc/WebScriptObject.mm:
        (+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
	Added additional conversion Undefined -> WebUndefined.
        * bindings/objc/objc_utility.mm:
        (KJS::Bindings::convertObjcValueToValue):
	Added additional conversion WebUndefined -> Undefined.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 145d960bbe35fd9028b64cb318a59a88f9ecdd1f..16784734c2438c9d090e4b4dd6b872fdf5ae14c3 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,25 @@
+2004-11-01  Richard Williamson   <rjw@apple.com>
+
+        Fixed <rdar://problem/3861257> WebUndefined should be returned for undefined values
+
+        Reviewed by John.
+
+        * ChangeLog:
+        * bindings/objc/WebScriptObject.mm:
+        (+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
+       Added additional conversion Undefined -> WebUndefined.
+        * bindings/objc/objc_utility.mm:
+        (KJS::Bindings::convertObjcValueToValue):
+       Added additional conversion WebUndefined -> Undefined.
+
+2004-11-01  Richard Williamson   <rjw@apple.com>
+
+
+        Reviewed by John.
+
+        * bindings/objc/WebScriptObject.mm:
+        (+[WebScriptObject _convertValueToObjcValue:KJS::root:Bindings::]):
+
 2004-11-01  Darin Adler  <darin@apple.com>
 
         - fixed <rdar://problem/3855573> Remove reference to "WebScriptMethods" from WebScriptObject.h comments

diff --git a/JavaScriptCore/bindings/objc/WebScriptObject.mm b/JavaScriptCore/bindings/objc/WebScriptObject.mm
index 690c5998bb27b6382ddacb569b75e603c97ca92e..ee6ec0987f335cd8ef5449f1b52812c09315b8cc 100644 (file)
--- a/JavaScriptCore/bindings/objc/WebScriptObject.mm
+++ b/JavaScriptCore/bindings/objc/WebScriptObject.mm
@@ -393,6 +393,13 @@ static KJS::List listFromNSArray(ExecState *exec, NSArray *array)
         result = [NSNumber numberWithBool:b->value()];
     }
     
+    // Convert JavaScript Undefined types to WebUndefined
+    else if (value.type() == KJS::UndefinedType) {
+        result = [WebUndefined undefined];
+    }
+    
+    // Other types (UnspecifiedType and NullType) converted to 0.
+    
     return result;
 }
 

diff --git a/JavaScriptCore/bindings/objc/objc_utility.mm b/JavaScriptCore/bindings/objc/objc_utility.mm
index 313f6520a90b929b12ef7dbc83e04373782679f6..85c64c5950826d3d84289ed80f8ac6a780285a9f 100644 (file)
--- a/JavaScriptCore/bindings/objc/objc_utility.mm
+++ b/JavaScriptCore/bindings/objc/objc_utility.mm
@@ -194,6 +194,9 @@ Value KJS::Bindings::convertObjcValueToValue (KJS::ExecState *exec, void *buffer
                     aValue = String (u);
                     free((void *)chars);
                 }
+                else if (*obj == [WebUndefined undefined]) {
+                    return Undefined();
+                }
                 else if ((CFBooleanRef)*obj == kCFBooleanTrue) {
                     aValue = Boolean(true);
                 }