Changeset 18715 in webkit for trunk/JavaScriptCore/kjs/value.cpp

Timestamp:

Jan 9, 2007, 9:38:46 AM (18 years ago)

Author:

ap

Message:

2007-01-09 Mitz Pettel <​[email protected]>

Reviewed by Darin.

• changes for ​http://bugs.webkit.org/show_bug.cgi?id=11078 Forms Don't Submit (ASP Pages)

JavaScriptCore:

• JavaScriptCore.exp:
• kjs/value.cpp: (KJS::JSValue::toInt32): Folded toInt32Inline into this method, which was its only caller. (KJS::JSValue::toUInt32): Added a variant that reports if the conversion has succeeded.
• kjs/value.h:

WebCore:

• bindings/js/kjs_html.cpp: (KJS::JSHTMLCollectionProtoFunc::callAsFunction): Changed item() to fall back to namedItem() if its argument does not convert to a number.

LayoutTests:

• fast/dom/collection-namedItem-via-item-expected.txt: Added.
• fast/dom/collection-namedItem-via-item.html: Added.

File:

• trunk/JavaScriptCore/kjs/value.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/value.cpp

@@ -56 +56 @@
 }
 
-inline int32_t JSValue::toInt32Inline(ExecState* exec, bool& ok) const
+int32_t JSValue::toInt32(ExecState* exec) const
+{
+    bool ok;
+    return toInt32(exec, ok);
+}
+
+int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
 {
     ok = true;
@@ -79 +85 @@
 }
 
-int32_t JSValue::toInt32(ExecState* exec) const
+uint32_t JSValue::toUInt32(ExecState* exec) const
 {
     bool ok;
-    return toInt32(exec, ok);
+    return toUInt32(exec, ok);
 }
 
-int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
+uint32_t JSValue::toUInt32(ExecState* exec, bool& ok) const
 {
-    return toInt32Inline(exec, ok);
-}
+    ok = true;
 
-uint32_t JSValue::toUInt32(ExecState *exec) const
-{
     uint32_t i;
     if (getUInt32(i))
@@ -97 +100 @@
 
     double d = roundValue(exec, const_cast<JSValue*>(this));
-    if (isNaN(d) || isInf(d))
+    if (isNaN(d) || isInf(d)) {
+        ok = false;
         return 0;
+    }
     double d32 = fmod(d, D32);