Changeset 269481 in webkit

Timestamp:

Nov 5, 2020, 3:27:47 PM (6 years ago)

Author:

Chris Dumez

Message:

Add implementation for Object.getOwnPropertyNames() on HTMLDocument
​https://bugs.webkit.org/show_bug.cgi?id=218625

Reviewed by Geoffrey Garen.

LayoutTests/imported/w3c:

Rebaseline test now that more checks are passing. The checks we are failing are failing
in Blink & Gecko also. The checks are are now passing are also passing in Blink & Gecko.

• web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names-expected.txt:

Source/WebCore:

Add implementation for Object.getOwnPropertyNames() on HTMLDocument so that it properly
returns names of the properties that would be returned by the named property getter.
This aligns our behavior with Blink and Gecko.

No new tests, rebaselined existing test.

• dom/TreeScopeOrderedMap.cpp:

(WebCore::TreeScopeOrderedMap::keys const):

• dom/TreeScopeOrderedMap.h:
• html/HTMLDocument.cpp:

(WebCore::HTMLDocument::supportedPropertyNames const):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/TreeScopeOrderedMap.cpp (modified) (1 diff)
• Source/WebCore/dom/TreeScopeOrderedMap.h (modified) (1 diff)
• Source/WebCore/html/HTMLDocument.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Add implementation for Object.getOwnPropertyNames() on HTMLDocument
+        https://bugs.webkit.org/show_bug.cgi?id=218625
+
+        Reviewed by Geoffrey Garen.
+
+        Rebaseline test now that more checks are passing. The checks we are failing are failing
+        in Blink & Gecko also. The checks are are now passing are also passing in Blink & Gecko.
+
+        * web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names-expected.txt:
+
 2020-11-05  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/dom/documents/dom-tree-accessors/nameditem-names-expected.txt

@@ -1 +1 @@
 
-FAIL An embed name appears in a document's property names if the embed is exposed. assert_true: expected true got false
-PASS An embed name does not appears in a document's property names if the embed is inside another embed.
-FAIL A form name appears in a document's property names. assert_true: expected true got false
-FAIL An iframe name appears in a document's property names. assert_true: expected true got false
-FAIL An img name appears in a document's property names when the img has no id. assert_true: expected true got false
+PASS An embed name appears in a document's property names if the embed is exposed.
+FAIL An embed name does not appears in a document's property names if the embed is inside another embed. assert_false: expected false got true
+PASS A form name appears in a document's property names.
+PASS An iframe name appears in a document's property names.
+PASS An img name appears in a document's property names when the img has no id.
 FAIL An object name appears in a document's property names if the object is exposed. assert_true: expected true got false
 FAIL An object id appears in a document's property names if the object is exposed. assert_true: expected true got false
-PASS An object name does not appear in a document's property names if the object is inside another object.
-PASS An object id does not appear in a document's property names if the object is inside another object.
-FAIL An img name appears in a document's property names when the img has an id. assert_true: expected true got false
-FAIL An img id appears in a document's property names when the img has a name. assert_true: expected true got false
+FAIL An object name does not appear in a document's property names if the object is inside another object. assert_false: expected false got true
+FAIL An object id does not appear in a document's property names if the object is inside another object. assert_false: expected false got true
+PASS An img name appears in a document's property names when the img has an id.
+PASS An img id appears in a document's property names when the img has a name.
 PASS An img id does not appear in a document's property names when the img has no name.
-FAIL A document's property names can include integer strings. assert_true: expected true got false
+PASS A document's property names can include integer strings.
 PASS A template name does not appear in a document's property names.
 PASS An img name does not appear in a document's property names when the img is in a template's document fragment.
-FAIL A document's property names appear in tree order. assert_equals: expected 0 but got -1
+FAIL A document's property names appear in tree order. assert_greater_than: expected a number greater than 5 but got 0
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Add implementation for Object.getOwnPropertyNames() on HTMLDocument
+        https://bugs.webkit.org/show_bug.cgi?id=218625
+
+        Reviewed by Geoffrey Garen.
+
+        Add implementation for Object.getOwnPropertyNames() on HTMLDocument so that it properly
+        returns names of the properties that would be returned by the named property getter.
+        This aligns our behavior with Blink and Gecko.
+
+        No new tests, rebaselined existing test.
+
+        * dom/TreeScopeOrderedMap.cpp:
+        (WebCore::TreeScopeOrderedMap::keys const):
+        * dom/TreeScopeOrderedMap.h:
+        * html/HTMLDocument.cpp:
+        (WebCore::HTMLDocument::supportedPropertyNames const):
+
 2020-11-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/dom/TreeScopeOrderedMap.cpp

@@ -217 +217 @@
 }
 
+const Vector<AtomString> TreeScopeOrderedMap::keys() const
+{
+    Vector<AtomString> result;
+    result.reserveInitialCapacity(m_map.size());
+    for (auto* key : m_map.keys())
+        result.uncheckedAppend(const_cast<AtomStringImpl*>(key));
+    return result;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/dom/TreeScopeOrderedMap.h

@@ -66 +66 @@
     const Vector<Element*>* getAllElementsById(const AtomStringImpl&, const TreeScope&) const;
 
+    const Vector<AtomString> keys() const;
+
 private:
     template <typename KeyMatchingFunction>

trunk/Source/WebCore/html/HTMLDocument.cpp

@@ -141 +141 @@
 Vector<AtomString> HTMLDocument::supportedPropertyNames() const
 {
-    // https://html.spec.whatwg.org/multipage/dom.html#dom-document-namedItem-which
-    //
-    // ... The supported property names of a Document object document at any moment consist of the following, in
-    // tree order according to the element that contributed them, ignoring later duplicates, and with values from
-    // id attributes coming before values from name attributes when the same element contributes both:
-    //
-    // - the value of the name content attribute for all applet, exposed embed, form, iframe, img, and exposed
-    //   object elements that have a non-empty name content attribute and are in a document tree with document
-    //   as their root;
-    // - the value of the id content attribute for all applet and exposed object elements that have a non-empty
-    //   id content attribute and are in a document tree with document as their root; and
-    // - the value of the id content attribute for all img elements that have both a non-empty id content attribute
-    //   and a non-empty name content attribute, and are in a document tree with document as their root.
-
-    // FIXME: Implement.
-    return { };
+    auto properties = m_documentNamedItem.keys();
+    // The specification says these should be sorted in document order but this would be expensive
+    // and other browser engines do not comply with this part of the specification. For now, just
+    // do an alphabetical sort to get consistent results.
+    std::sort(properties.begin(), properties.end(), WTF::codePointCompareLessThan);
+    return properties;
 }