Changeset 288162 in webkit

Timestamp:

Jan 18, 2022 4:27:43 PM (6 months ago)

Author:

Chris Dumez

Message:

input.labels doesn't work inside shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=235326

Reviewed by Darin Adler.

LayoutTests/imported/w3c:

Rebaseline test that now has one extra passing subtest. This subtest was already passing in both
Gecko and Blink.

• web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub-expected.txt:

Source/WebCore:

HTMLCollection and LiveNodeList had the concept of "isRootedAtDocument" which meant that
we used the document as root when doing the traversal to find Nodes that belong to the
list/collection. However, when the list's owner is inside a shadow tree, this didn't
work as expected since we would traverse the main document's DOM tree instead of the
shadow tree. To address the issue, I now renamed "isRootedAtDocument" to
"isRootedAtTreeScope" and updated rootNode() to return the owner's tree scope's root
node, instead of the owner's document.

No new tests, rebaselined existing test.

• dom/Document.cpp:

(WebCore::Document::registerNodeListForInvalidation):
(WebCore::Document::registerCollection):
(WebCore::Document::unregisterCollection):

• dom/LiveNodeList.h:

(WebCore::LiveNodeList::rootNode const):

• dom/NameNodeList.h:
• dom/NodeRareData.h:

(WebCore::NodeListsNodeData::adoptDocument):

• html/HTMLCollection.cpp:

(WebCore::HTMLCollection::rootTypeFromCollectionType):

• html/HTMLCollection.h:

(WebCore::HTMLCollection::rootNode const):
(WebCore::HTMLCollection::isRootedAtTreeScope const):
(WebCore::HTMLCollection::isRootedAtDocument const): Deleted.

• html/LabelsNodeList.h:
• html/RadioNodeList.cpp:

(WebCore::RadioNodeList::RadioNodeList):

• html/RadioNodeList.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (3 diffs)
• Source/WebCore/dom/LiveNodeList.h (modified) (2 diffs)
• Source/WebCore/dom/NameNodeList.h (modified) (1 diff)
• Source/WebCore/dom/NodeRareData.h (modified) (1 diff)
• Source/WebCore/html/HTMLCollection.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLCollection.h (modified) (4 diffs)
• Source/WebCore/html/LabelsNodeList.h (modified) (1 diff)
• Source/WebCore/html/RadioNodeList.cpp (modified) (1 diff)
• Source/WebCore/html/RadioNodeList.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-01-18  Chris Dumez  <cdumez@apple.com>
+
+        input.labels doesn't work inside shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=235326
+
+        Reviewed by Darin Adler.
+
+        Rebaseline test that now has one extra passing subtest. This subtest was already passing in both
+        Gecko and Blink.
+
+        * web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub-expected.txt:
+
 2022-01-18  Sam Weinig  <weinig@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/forms/the-label-element/label-attributes.sub-expected.txt

@@ -13 +13 @@
 FAIL A div element which contains labelable element is removed. assert_equals: The number of labels should be 1 after the labelable element is removed but label element is still in the same tree. expected 1 but got 0
 FAIL A labelable element not in a document can label element in the same tree. assert_equals: The number of labels associated with a form control should be the number of label elements for which it is a labeled control. expected 2 but got 0
-FAIL A labelable element inside the shadow DOM. assert_equals: The form control has an ancestor with no explicit associated label, and it is the first labelable descendant. expected 1 but got 0
+PASS A labelable element inside the shadow DOM.
 PASS A form control has an implicit label.
 PASS A form control has no label 1.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-18  Chris Dumez  <cdumez@apple.com>
+
+        input.labels doesn't work inside shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=235326
+
+        Reviewed by Darin Adler.
+
+        HTMLCollection and LiveNodeList had the concept of "isRootedAtDocument" which meant that
+        we used the document as root when doing the traversal to find Nodes that belong to the
+        list/collection. However, when the list's owner is inside a shadow tree, this didn't
+        work as expected since we would traverse the main document's DOM tree instead of the
+        shadow tree. To address the issue, I now renamed "isRootedAtDocument" to
+        "isRootedAtTreeScope" and updated rootNode() to return the owner's tree scope's root
+        node, instead of the owner's document.
+
+        No new tests, rebaselined existing test.
+
+        * dom/Document.cpp:
+        (WebCore::Document::registerNodeListForInvalidation):
+        (WebCore::Document::registerCollection):
+        (WebCore::Document::unregisterCollection):
+        * dom/LiveNodeList.h:
+        (WebCore::LiveNodeList::rootNode const):
+        * dom/NameNodeList.h:
+        * dom/NodeRareData.h:
+        (WebCore::NodeListsNodeData::adoptDocument):
+        * html/HTMLCollection.cpp:
+        (WebCore::HTMLCollection::rootTypeFromCollectionType):
+        * html/HTMLCollection.h:
+        (WebCore::HTMLCollection::rootNode const):
+        (WebCore::HTMLCollection::isRootedAtTreeScope const):
+        (WebCore::HTMLCollection::isRootedAtDocument const): Deleted.
+        * html/LabelsNodeList.h:
+        * html/RadioNodeList.cpp:
+        (WebCore::RadioNodeList::RadioNodeList):
+        * html/RadioNodeList.h:
+
 2022-01-18  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -4835 +4835 @@
 {
     m_nodeListAndCollectionCounts[list.invalidationType()]++;
-    if (!list.isRootedAtDocument())
+    if (!list.isRootedAtTreeScope())
         return;
     ASSERT(!list.isRegisteredForInvalidationAtDocument());
@@ -4856 +4856 @@
 {
     m_nodeListAndCollectionCounts[collection.invalidationType()]++;
-    if (collection.isRootedAtDocument())
+    if (collection.isRootedAtTreeScope())
         m_collectionsInvalidatedAtDocument.add(&collection);
 }
@@ -4864 +4864 @@
     ASSERT(m_nodeListAndCollectionCounts[collection.invalidationType()]);
     m_nodeListAndCollectionCounts[collection.invalidationType()]--;
-    if (!collection.isRootedAtDocument())
+    if (!collection.isRootedAtTreeScope())
         return;
 

trunk/Source/WebCore/dom/LiveNodeList.h

@@ -44 +44 @@
 
     virtual bool elementMatches(Element&) const = 0;
-    virtual bool isRootedAtDocument() const = 0;
+    virtual bool isRootedAtTreeScope() const = 0;
 
     NodeListInvalidationType invalidationType() const { return m_invalidationType; }
@@ -140 +140 @@
 inline ContainerNode& LiveNodeList::rootNode() const
 {
-    if (isRootedAtDocument() && m_ownerNode->isConnected())
-        return document();
-
+    if (isRootedAtTreeScope() && m_ownerNode->isInTreeScope())
+        return m_ownerNode->treeScope().rootNode();
     return m_ownerNode;
 }

trunk/Source/WebCore/dom/NameNodeList.h

@@ -35 +35 @@
 
     bool elementMatches(Element&) const final;
-    bool isRootedAtDocument() const final { return false; }
+    bool isRootedAtTreeScope() const final { return false; }
 
 private:

trunk/Source/WebCore/dom/NodeRareData.h

@@ -199 +199 @@
 
         for (auto& list : m_tagCollectionNSCache.values()) {
-            ASSERT(!list->isRootedAtDocument());
+            ASSERT(!list->isRootedAtTreeScope());
             list->invalidateCacheForDocument(oldDocument);
         }

trunk/Source/WebCore/html/HTMLCollection.cpp

@@ -49 +49 @@
     case DocumentAllNamedItems:
     case FormControls:
-        return HTMLCollection::IsRootedAtDocument;
+        return HTMLCollection::IsRootedAtTreeScope;
     case AllDescendants:
     case ByClass:

trunk/Source/WebCore/html/HTMLCollection.h

@@ -76 +76 @@
     size_t memoryCost() const override;
 
-    bool isRootedAtDocument() const;
+    bool isRootedAtTreeScope() const;
     NodeListInvalidationType invalidationType() const;
     CollectionType type() const;
@@ -100 +100 @@
     void invalidateNamedElementCache(Document&) const;
 
-    enum RootType { IsRootedAtNode, IsRootedAtDocument };
+    enum RootType { IsRootedAtNode, IsRootedAtTreeScope };
     static RootType rootTypeFromCollectionType(CollectionType);
 
@@ -116 +116 @@
 inline ContainerNode& HTMLCollection::rootNode() const
 {
-    if (isRootedAtDocument() && ownerNode().isConnected())
-        return ownerNode().document();
-
+    if (isRootedAtTreeScope() && ownerNode().isInTreeScope())
+        return ownerNode().treeScope().rootNode();
     return ownerNode();
 }
@@ -180 +179 @@
 }
 
-inline bool HTMLCollection::isRootedAtDocument() const
-{
-    return m_rootType == IsRootedAtDocument;
+inline bool HTMLCollection::isRootedAtTreeScope() const
+{
+    return m_rootType == IsRootedAtTreeScope;
 }
 

trunk/Source/WebCore/html/LabelsNodeList.h

@@ -38 +38 @@
 
     bool elementMatches(Element&) const final;
-    bool isRootedAtDocument() const final { return true; }
+    bool isRootedAtTreeScope() const final { return true; }
 
 private:

trunk/Source/WebCore/html/RadioNodeList.cpp

@@ -43 +43 @@
     : CachedLiveNodeList(rootNode, InvalidateForFormControls)
     , m_name(name)
-    , m_isRootedAtDocument(is<HTMLFormElement>(rootNode))
+    , m_isRootedAtTreeScope(is<HTMLFormElement>(rootNode))
 {
 }

trunk/Source/WebCore/html/RadioNodeList.h

@@ -43 +43 @@
 private:
     RadioNodeList(ContainerNode&, const AtomString& name);
-    bool isRootedAtDocument() const final { return m_isRootedAtDocument; }
+    bool isRootedAtTreeScope() const final { return m_isRootedAtTreeScope; }
 
     AtomString m_name;
-    bool m_isRootedAtDocument;
+    bool m_isRootedAtTreeScope;
 };