Changeset 142846 in webkit

Timestamp:

Feb 13, 2013 8:17:41 PM (11 years ago)

Author:

Vineet

Message:

[Regression] After r142831 collection-null-like-arguments.html layout test failing
​https://bugs.webkit.org/show_bug.cgi?id=109780

Reviewed by Kentaro Hara.

No new tests. LayoutTests/fast/dom/collection-null-like-arguments.html
Should pass now.

• bindings/js/JSHTMLAllCollectionCustom.cpp: Return null for namedItem() only.

(WebCore::getNamedItems):
(WebCore::JSHTMLAllCollection::namedItem):

• bindings/js/JSHTMLFormControlsCollectionCustom.cpp: Ditto.

(WebCore::getNamedItems):
(WebCore::JSHTMLFormControlsCollection::namedItem):

• bindings/js/JSHTMLOptionsCollectionCustom.cpp: Ditto.

(WebCore::getNamedItems):
(WebCore::JSHTMLOptionsCollection::namedItem):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSHTMLAllCollectionCustom.cpp (modified) (2 diffs)
• bindings/js/JSHTMLFormControlsCollectionCustom.cpp (modified) (2 diffs)
• bindings/js/JSHTMLOptionsCollectionCustom.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-13   Vineet Chaudhary  <rgf748@motorola.com>
+
+        [Regression] After r142831  collection-null-like-arguments.html layout test failing
+        https://bugs.webkit.org/show_bug.cgi?id=109780
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. LayoutTests/fast/dom/collection-null-like-arguments.html
+        Should pass now.
+
+        * bindings/js/JSHTMLAllCollectionCustom.cpp: Return null for namedItem() only.
+        (WebCore::getNamedItems):
+        (WebCore::JSHTMLAllCollection::namedItem):
+        * bindings/js/JSHTMLFormControlsCollectionCustom.cpp: Ditto.
+        (WebCore::getNamedItems):
+        (WebCore::JSHTMLFormControlsCollection::namedItem):
+        * bindings/js/JSHTMLOptionsCollectionCustom.cpp: Ditto.
+        (WebCore::getNamedItems):
+        (WebCore::JSHTMLOptionsCollection::namedItem):
+
 2013-02-13  Soo-Hyun Choi  <sh9.choi@samsung.com>
 

trunk/Source/WebCore/bindings/js/JSHTMLAllCollectionCustom.cpp

@@ -47 +47 @@
 
     if (namedItems.isEmpty())
-        return jsNull();
+        return jsUndefined();
     if (namedItems.size() == 1)
         return toJS(exec, collection->globalObject(), namedItems[0].get());
@@ -117 +117 @@
 JSValue JSHTMLAllCollection::namedItem(ExecState* exec)
 {
-    return getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    JSValue value = getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    return value.isUndefined() ? jsNull() : value;
 }
 

trunk/Source/WebCore/bindings/js/JSHTMLFormControlsCollectionCustom.cpp

@@ -45 +45 @@
 
     if (namedItems.isEmpty())
-        return jsNull();
+        return jsUndefined();
     if (namedItems.size() == 1)
         return toJS(exec, collection->globalObject(), namedItems[0].get());
@@ -66 +66 @@
 JSValue JSHTMLFormControlsCollection::namedItem(ExecState* exec)
 {
-    return getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    JSValue value = getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    return value.isUndefined() ? jsNull() : value;
 }
 

trunk/Source/WebCore/bindings/js/JSHTMLOptionsCollectionCustom.cpp

@@ -45 +45 @@
 
     if (namedItems.isEmpty())
-        return jsNull();
+        return jsUndefined();
     if (namedItems.size() == 1)
         return toJS(exec, collection->globalObject(), namedItems[0].get());
@@ -66 +66 @@
 JSValue JSHTMLOptionsCollection::namedItem(ExecState* exec)
 {
-    return getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    JSValue value = getNamedItems(exec, this, Identifier(exec, exec->argument(0).toString(exec)->value(exec)));
+    return value.isUndefined() ? jsNull() : value;
 }