Changeset 275872 in webkit

Timestamp:

Apr 13, 2021, 2:05:44 AM (6 years ago)

Author:

rniwa@webkit.org

Message:

Use WTF::compactMap in HTMLSlotElement
​https://bugs.webkit.org/show_bug.cgi?id=224470

Reviewed by Antti Koivisto.

Cleaned up the code in assignedNodes and assignedElements with WTF::compactMap.

• html/HTMLSlotElement.cpp:

(WebCore::HTMLSlotElement::assignedNodes const):
(WebCore::HTMLSlotElement::assignedElements const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLSlotElement.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use WTF::compactMap in HTMLSlotElement
+        https://bugs.webkit.org/show_bug.cgi?id=224470
+
+        Reviewed by Antti Koivisto.
+
+        Cleaned up the code in assignedNodes and assignedElements with WTF::compactMap.
+
+        * html/HTMLSlotElement.cpp:
+        (WebCore::HTMLSlotElement::assignedNodes const):
+        (WebCore::HTMLSlotElement::assignedElements const):
+
 2021-04-13  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/html/HTMLSlotElement.cpp

@@ -142 +142 @@
         return nodes;
     }
-    auto* assignedNodes = this->assignedNodes();
-    if (!assignedNodes)
-        return { };
 
-    Vector<Ref<Node>> nodes;
-    nodes.reserveInitialCapacity(assignedNodes->size());
-    for (auto& nodePtr : *assignedNodes) {
-        auto* node = nodePtr.get();
-        if (UNLIKELY(!node))
-            continue;
-        nodes.uncheckedAppend(*node);
+    if (auto* nodes = assignedNodes(); nodes) {
+        return WTF::compactMap(*nodes, [](auto& nodeWeakPtr) -> RefPtr<Node> {
+            return nodeWeakPtr.get();
+        });
     }
 
-    return nodes;
+    return { };
 }
 
 Vector<Ref<Element>> HTMLSlotElement::assignedElements(const AssignedNodesOptions& options) const
 {
-    auto nodes = assignedNodes(options);
-
-    Vector<Ref<Element>> elements;
-    elements.reserveCapacity(nodes.size());
-    for (auto& node : nodes) {
-        if (is<Element>(node))
-            elements.uncheckedAppend(static_reference_cast<Element>(WTFMove(node)));
-    }
-
-    return elements;
+    return WTF::compactMap(assignedNodes(options), [](auto&& node) -> RefPtr<Element> {
+        if (!is<Element>(node))
+            return nullptr;
+        return static_reference_cast<Element>(WTFMove(node));
+    });
 }