Changeset 30034 in webkit

Timestamp:

Feb 5, 2008 8:36:31 PM (16 years ago)

Author:

weinig@apple.com

Message:

JavaScriptCore:

Reviewed by Anders Carlsson.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=8080
NodeList (and other DOM lists) items are not enumeratable using for..in

• JavaScriptCore.exp:

WebCore:

Reviewed by Anders Carlsson.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=8080
NodeList (and other DOM lists) items are not enumeratable using for..in

• Match Firefox when enumerating DOM interfaces with indexGetters (support for the array bracket, nodeList[0], notation) by including all the items in the list before the attributes and methods of the interface.

Test: fast/dom/domListEnumeration.html

• ForwardingHeaders/kjs/PropertyNameArray.h: Added.
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetPropertyNames): Use the new custom method model.
• bindings/js/JSHistoryCustom.cpp: (WebCore::JSHistory::customGetPropertyNames): ditto.
• bindings/scripts/CodeGeneratorJS.pm: Instead of just adding a declaration of getProperyNames and implementing the method in the Custom.cpp, move to a the model used by generated getOwnPropertySlot() and put() where the custom code is written in a separate customGetPropertyNames which returns a bool indicating whether to call up to the base class. This enables adding the list indexes to the PropertyNameArray for interfaces with indexGetters automatically.

LayoutTests:

Reviewed by Anders Carlsson.

Test for ​http://bugs.webkit.org/show_bug.cgi?id=8080
NodeList (and other DOM lists) items are not enumeratable using for..in

• fast/dom/domListEnumeration-expected.txt: Added.
• fast/dom/domListEnumeration.html: Added.
• fast/dom/resources/domListEnumeration.js: Added.

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/JavaScriptCore.exp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/domListEnumeration-expected.txt (added)
• LayoutTests/fast/dom/domListEnumeration.html (added)
• LayoutTests/fast/dom/resources/domListEnumeration.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/ForwardingHeaders/kjs/PropertyNameArray.h (added)
• WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• WebCore/bindings/js/JSHistoryCustom.cpp (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorJS.pm (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-02-05  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=8080
+        NodeList (and other DOM lists) items are not enumeratable using for..in
+
+        * JavaScriptCore.exp:
+
 2008-02-05  Mark Rowe  <mrowe@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -181 +181 @@
 __ZN3KJS7UString3Rep4nullE
 __ZN3KJS7UString3Rep7destroyEv
+__ZN3KJS7UString4fromEj
 __ZN3KJS7UString6appendERKS0_
 __ZN3KJS7UStringC1EPKNS_5UCharEi

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-02-05  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Test for http://bugs.webkit.org/show_bug.cgi?id=8080
+        NodeList (and other DOM lists) items are not enumeratable using for..in
+
+        * fast/dom/domListEnumeration-expected.txt: Added.
+        * fast/dom/domListEnumeration.html: Added.
+        * fast/dom/resources/domListEnumeration.js: Added.
+
 2008-02-05  Nikolas Zimmermann  <zimmermann@kde.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-05  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        Fix for http://bugs.webkit.org/show_bug.cgi?id=8080
+        NodeList (and other DOM lists) items are not enumeratable using for..in
+
+        - Match Firefox when enumerating DOM interfaces with indexGetters (support for 
+          the array bracket, nodeList[0], notation) by including all the items in the
+          list before the attributes and methods of the interface.
+
+        Test: fast/dom/domListEnumeration.html
+
+        * ForwardingHeaders/kjs/PropertyNameArray.h: Added.
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::JSDOMWindow::customGetPropertyNames): Use the new custom method model. 
+        * bindings/js/JSHistoryCustom.cpp:
+        (WebCore::JSHistory::customGetPropertyNames): ditto.
+        * bindings/scripts/CodeGeneratorJS.pm: Instead of just adding a declaration of
+        getProperyNames and implementing the method in the Custom.cpp, move to a the 
+        model used by generated getOwnPropertySlot() and put() where the custom code
+        is written in a separate customGetPropertyNames which returns a bool indicating
+        whether to call up to the base class.  This enables adding the list indexes
+        to the PropertyNameArray for interfaces with indexGetters automatically.
+
 2008-02-05  Samuel Weinig  <sam@webkit.org>
 

trunk/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -126 +126 @@
 }
 
-void JSDOMWindow::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+bool JSDOMWindow::customGetPropertyNames(ExecState* exec, PropertyNameArray&)
 {
     // Only allow the window to enumerated by frames in the same origin.
     if (!allowsAccessFrom(exec))
-        return;
-    Base::getPropertyNames(exec, propertyNames);
+        return true;
+    return false;
 }
 

trunk/WebCore/bindings/js/JSHistoryCustom.cpp

@@ -85 +85 @@
 }
 
-void JSHistory::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+bool JSHistory::customGetPropertyNames(ExecState* exec, PropertyNameArray&)
 {
     // Only allow the history object to enumerated by frames in the same origin.
     if (!allowsAccessFromFrame(exec, impl()->frame()))
-        return;
-    Base::getPropertyNames(exec, propertyNames);
+        return true;
+    return false;
 }
 

trunk/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -370 +370 @@
 
     # Custom getPropertyNames function
-    push(@headerContent, "    virtual void getPropertyNames(KJS::ExecState*, KJS::PropertyNameArray&);\n") if $dataNode->extendedAttributes->{"CustomGetPropertyNames"};
+    push(@headerContent, "    virtual void getPropertyNames(KJS::ExecState*, KJS::PropertyNameArray&);\n") if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"HasIndexGetter"});
+    push(@headerContent, "    bool customGetPropertyNames(KJS::ExecState*, KJS::PropertyNameArray&);\n") if $dataNode->extendedAttributes->{"CustomGetPropertyNames"};
 
     # Constructor object getter
@@ -587 +588 @@
     push(@implContentHeader, "#include \"$className.h\"\n\n");
     push(@implContentHeader, "#include <wtf/GetPtr.h>\n\n");
+
+    push(@implContentHeader, "#include <kjs/PropertyNameArray.h>\n") if $dataNode->extendedAttributes->{"HasIndexGetter"};
 
     AddIncludesForType($interfaceName);
@@ -1056 +1059 @@
     }
 
+    if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"} || $dataNode->extendedAttributes->{"HasIndexGetter"}) {
+        push(@implContent, "void ${className}::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)\n");
+        push(@implContent, "{\n");
+        if ($dataNode->extendedAttributes->{"CustomGetPropertyNames"}) {
+            push(@implContent, "    if (customGetPropertyNames(exec, propertyNames))\n");
+            push(@implContent, "        return;\n");
+        }
+        if ($dataNode->extendedAttributes->{"HasIndexGetter"}) {
+            push(@implContent, "    for (unsigned i = 0; i < static_cast<${implClassName}*>(impl())->length(); ++i)\n");
+            push(@implContent, "        propertyNames.add(Identifier::from(i));\n");
+        }
+        push(@implContent, "     Base::getPropertyNames(exec, propertyNames);\n");
+        push(@implContent, "}\n\n");
+    }
+
     if ($dataNode->extendedAttributes->{"GenerateConstructor"}) {
         push(@implContent, "JSValue* ${className}::getConstructor(ExecState* exec)\n{\n");
         push(@implContent, "    return KJS::cacheGlobalObject<${className}Constructor>(exec, \"[[${interfaceName}.constructor]]\");\n");
-        push(@implContent, "}\n");
+        push(@implContent, "}\n\n");
     }