LayoutTests:

        Reviewed by Darin.

        - updated results, null is not round-tripped through the bindings
          because of regressions the original change caused in other applications.
        - added an echo for "undefined".

        * plugins/bindings-test-expected.txt:
        * plugins/bindings-test.html:

WebCore:

        Reviewed by Darin.

        <rdar://problem/4651318> REGRESSION: can't drag library items to widget in Dashcode
        <rdar://problem/4701626> REGRESSION: Unit Converter widget doesn't work convert data in its fields

        jsNull should not be returned as NSNull because existing applications do not
        expect that return value. Return as nil for backwards compatibility.

        * bindings/objc/WebScriptObject.mm:
        (+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 45b0ff0ff0b773c1e165e6cb901c1a4933208b68..8179a9b0d1b4520bb07a8c587719d251c4d32971 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-01  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        - updated results, null is not round-tripped through the bindings
+          because of regressions the original change caused in other applications.
+        - added an echo for "undefined".
+
+        * plugins/bindings-test-expected.txt:
+        * plugins/bindings-test.html:
+
 2006-09-01  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Eric.

diff --git a/LayoutTests/plugins/bindings-test-expected.txt b/LayoutTests/plugins/bindings-test-expected.txt
index dd9cd62bdffb4429568fdbd4f8bb3f6c24600a3c..c8ebc507bbffcb353dc22172a3712f10e5f3585b 100644 (file)
--- a/LayoutTests/plugins/bindings-test-expected.txt
+++ b/LayoutTests/plugins/bindings-test-expected.txt
@@ -6,8 +6,10 @@ ALERT: hello = hello (same)
 ALERT: string = string (same)
 ALERT: 42 = 42 (same)
 ALERT: number = number (same)
-ALERT: null = null (same)
-ALERT: object = object (same)
+ALERT: null = undefined (same)
+ALERT: object = undefined (different)
+ALERT: undefined = undefined (same)
+ALERT: undefined = undefined (same)
 ALERT: one,two = one,two (same)
 ALERT: object = object (same)
 ALERT: String Hello == Hello

diff --git a/LayoutTests/plugins/bindings-test.html b/LayoutTests/plugins/bindings-test.html
index cecf99f66fc2cd5eb13ae4e930b096a85c6136eb..0b726d9e58bbda0cc4327ecbcab06136137d3a5d 100644 (file)
--- a/LayoutTests/plugins/bindings-test.html
+++ b/LayoutTests/plugins/bindings-test.html
@@ -46,6 +46,7 @@ function doTest()
         echoTest("hello");
         echoTest(42);
         echoTest(null);
+        echoTest(undefined);
         echoTest(new Array("one", "two"));
         
         // Test exceptions

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 22aae86de72eed715b5e72635146c58c0708c076..f9e1c9a4d2292a215547e9945d5fce656a253128 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2006-09-01  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        <rdar://problem/4651318> REGRESSION: can't drag library items to widget in Dashcode
+        <rdar://problem/4701626> REGRESSION: Unit Converter widget doesn't work convert data in its fields
+
+        jsNull should not be returned as NSNull because existing applications do not
+        expect that return value. Return as nil for backwards compatibility.
+
+        * bindings/objc/WebScriptObject.mm:
+        (+[WebScriptObject _convertValueToObjcValue:originExecutionContext:executionContext:]):
+
 2006-09-01  Alexey Proskuryakov  <ap@nypop.com>
 
         Release build fix.

diff --git a/WebCore/bindings/objc/WebScriptObject.mm b/WebCore/bindings/objc/WebScriptObject.mm
index db372d46b3431cf51c67f9b0deab9686ab1d1335..adcf8f749cde2ae322b139d756e9c18b90418195 100644 (file)
--- a/WebCore/bindings/objc/WebScriptObject.mm
+++ b/WebCore/bindings/objc/WebScriptObject.mm
@@ -445,11 +445,9 @@ static List listFromNSArray(ExecState *exec, NSArray *array)
     if (value->isUndefined())
         return [WebUndefined undefined];
 
-    if (value->isNull())
-        return [NSNull null];
-  
-    // Other types (e.g., UnspecifiedType) converted to nil.
-    // This should never happen.
+    // jsNull is not returned as NSNull because existing applications do not expect
+    // that return value. Return as nil for compatibility. <rdar://problem/4651318> <rdar://problem/4701626>
+    // Other types (e.g., UnspecifiedType) also return as nil.
     return nil;
 }