Simplify SVGPropertyOwnerRegistry slightly

https://bugs.webkit.org/show_bug.cgi?id=240839

Reviewed by Yusuke Suzuki.

SVGPropertyOwnerRegistry::findAccessor() had to loop through the hash table entries
because it wanted the behavior of QualifiedName::matches(), which is different from
QualifiedName::operator==. However, we can achieve this by using hash traits, and
the appropriate traits already exist in the form of SVGAttributeHashTranslator.

* Source/WebCore/svg/SVGElementInlines.h:
(WebCore::SVGAttributeHashTranslator::hash): Deleted.
(WebCore::SVGAttributeHashTranslator::equal): Deleted.
* Source/WebCore/svg/properties/SVGPropertyOwnerRegistry.h:
(WebCore::SVGAttributeHashTranslator::hash):
(WebCore::SVGAttributeHashTranslator::equal):
(WebCore::SVGPropertyOwnerRegistry::attributeNameToAccessorMap):
(WebCore::SVGPropertyOwnerRegistry::findAccessor):

Canonical link: https://commits.webkit.org/250948@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@294789 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/svg/SVGElementInlines.h

@@ -41,18 +41,6 @@ inline void SVGElement::setPresentationalHintStyleIsDirty()
     invalidateStyle();
 }
 
-struct SVGAttributeHashTranslator {
-    static unsigned hash(const QualifiedName& key)
-    {
-        if (key.hasPrefix()) {
-            QualifiedNameComponents components = { nullAtom().impl(), key.localName().impl(), key.namespaceURI().impl() };
-            return computeHash(components);
-        }
-        return DefaultHash<QualifiedName>::hash(key);
-    }
-    static bool equal(const QualifiedName& a, const QualifiedName& b) { return a.matches(b); }
-};
-
 inline bool Element::hasTagName(const SVGQualifiedName& tagName) const
 {
     return ContainerNode::hasTagName(tagName);

Source/WebCore/svg/properties/SVGPropertyOwnerRegistry.h

@@ -35,6 +35,21 @@ namespace WebCore {
 
 class SVGAttributeAnimator;
 
+struct SVGAttributeHashTranslator {
+    static unsigned hash(const QualifiedName& key)
+    {
+        if (key.hasPrefix()) {
+            QualifiedNameComponents components = { nullAtom().impl(), key.localName().impl(), key.namespaceURI().impl() };
+            return computeHash(components);
+        }
+        return DefaultHash<QualifiedName>::hash(key);
+    }
+    static bool equal(const QualifiedName& a, const QualifiedName& b) { return a.matches(b); }
+
+    static constexpr bool safeToCompareToEmptyOrDeleted = false;
+    static constexpr bool hasHashInValue = true;
+};
+
 template<typename OwnerType, typename... BaseTypes>
 class SVGPropertyOwnerRegistry : public SVGPropertyRegistry {
 public:
@@ -300,9 +315,11 @@ class SVGPropertyOwnerRegistry : public SVGPropertyRegistry {
 
 private:
     // Singleton map for every OwnerType.
-    static HashMap<QualifiedName, const SVGMemberAccessor<OwnerType>*>& attributeNameToAccessorMap()
+    using QualifiedNameAccessorHashMap = HashMap<QualifiedName, const SVGMemberAccessor<OwnerType>*, SVGAttributeHashTranslator>;
+
+    static QualifiedNameAccessorHashMap& attributeNameToAccessorMap()
     {
-        static NeverDestroyed<HashMap<QualifiedName, const SVGMemberAccessor<OwnerType>*>> attributeNameToAccessorMap;
+        static NeverDestroyed<QualifiedNameAccessorHashMap> attributeNameToAccessorMap;
         return attributeNameToAccessorMap;
     }
 
@@ -331,12 +348,7 @@ class SVGPropertyOwnerRegistry : public SVGPropertyRegistry {
 
     static const SVGMemberAccessor<OwnerType>* findAccessor(const QualifiedName& attributeName)
     {
-        // Here we need to loop through the entries in the map and use matches() to compare them with attributeName.
-        // m_map.contains() uses QualifiedName::operator==() which compares the impl pointers only while matches()
-        // compares the contents if the impl pointers differ.
-        auto it = std::find_if(attributeNameToAccessorMap().begin(), attributeNameToAccessorMap().end(), [&attributeName](const auto& entry) -> bool {
-            return entry.key.matches(attributeName);
-        });
+        auto it = attributeNameToAccessorMap().find(attributeName);
         return it != attributeNameToAccessorMap().end() ? it->value : nullptr;
     }