Reviewed by Darin.

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=10759
          fast/AppleScript/array.html test failing

WebCore:
        * bridge/mac/WebCoreFrameBridge.mm:
        (aeDescFromJSValue): Convert integer values to typeSInt32 AE descriptors.

LayoutTests:
        * fast/AppleScript/001-expected.txt: Updated results.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5d9ea0b0446295e520b85faefe9998dd23802fa1..69fd435a7508c09489a9ee09ad4bda42e9e05181 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-09  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=10759
+        fast/AppleScript/array.html test failing
+
+        * fast/AppleScript/001-expected.txt: Updated results.
+
 2006-09-07  Alexey Proskuryakov  <ap@nypop.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/fast/AppleScript/001-expected.txt b/LayoutTests/fast/AppleScript/001-expected.txt
index ac53abd64aa456bca80f64334d8bf8c53dbba0a4..a2314931d0be6c37a675c2a083ba5a96c8a0d8b0 100644 (file)
--- a/LayoutTests/fast/AppleScript/001-expected.txt
+++ b/LayoutTests/fast/AppleScript/001-expected.txt
@@ -1,8 +1,8 @@
 EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 1 of #text > BODY > HTML > #document to 65 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
 An automated test for basic AppleScript "do JavaScript" support.
-4 ('doub')
-4 ('doub')
+4 ('long')
+4 ('long')
 0.6666666666666666 ('doub')
 0.6666666666666666 ('doub')
 INF ('doub')

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 008d219ded43217caeceab79c8cde50451223e3f..43d47c4814b0c7f437d8c1ae0ce412aa19c240e6 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-09  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Darin.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=10759
+          fast/AppleScript/array.html test failing
+
+        * bridge/mac/WebCoreFrameBridge.mm:
+        (aeDescFromJSValue): Convert integer values to typeSInt32 AE descriptors.
+
 2006-09-08  Eric Seidel  <eric@eseidel.com>
 
         Reviewed by darin.

diff --git a/WebCore/bridge/mac/WebCoreFrameBridge.mm b/WebCore/bridge/mac/WebCoreFrameBridge.mm
index 0935b326e4761b33ef09db251fe01dfdfe86f1e9..f49deddab0735b3ecdd78d15aa7b65ce9173c9a0 100644 (file)
--- a/WebCore/bridge/mac/WebCoreFrameBridge.mm
+++ b/WebCore/bridge/mac/WebCoreFrameBridge.mm
@@ -171,8 +171,12 @@ static NSAppleEventDescriptor* aeDescFromJSValue(ExecState* exec, JSValue* jsVal
             aeDesc = [NSAppleEventDescriptor descriptorWithString:String(jsValue->getString())];
             break;
         case NumberType: {
-            Float64 value = jsValue->getNumber();
-            aeDesc = [NSAppleEventDescriptor descriptorWithDescriptorType:typeIEEE64BitFloatingPoint bytes:&value length:sizeof(value)];
+            double value = jsValue->getNumber();
+            int intValue = (int)value;
+            if (value == intValue)
+                aeDesc = [NSAppleEventDescriptor descriptorWithDescriptorType:typeSInt32 bytes:&intValue length:sizeof(intValue)];
+            else
+                aeDesc = [NSAppleEventDescriptor descriptorWithDescriptorType:typeIEEE64BitFloatingPoint bytes:&value length:sizeof(value)];
             break;
         }
         case ObjectType: {