From 9cd36839d2dfb9b74910a174e2b55cd1ed0bfc3e Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Wed, 22 Nov 2023 09:03:44 +1300
Subject: [PATCH] LibWeb: Port DOMStringMap from DeprecatedString to String

Porting name to FlyString as it is often compared in lookup, and in many
cases, we already have a FlyString to supply anyway.
---
 Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp | 10 +++++-----
 Userland/Libraries/LibWeb/HTML/DOMStringMap.h   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp b/Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp
index 4502eca601..a8cff392ea 100644
--- a/Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp
+++ b/Userland/Libraries/LibWeb/HTML/DOMStringMap.cpp
@@ -82,7 +82,7 @@ Vector<DOMStringMap::NameValuePair> DOMStringMap::get_name_value_pairs() const
             builder.append(current_character);
         }
 
-        list.append({ builder.to_deprecated_string(), value });
+        list.append({ MUST(builder.to_string()), MUST(String::from_deprecated_string(value)) });
     });
 
     // 4. Return list.
@@ -97,18 +97,18 @@ Vector<String> DOMStringMap::supported_property_names() const
     Vector<String> names;
     auto name_value_pairs = get_name_value_pairs();
     for (auto& name_value_pair : name_value_pairs) {
-        names.append(MUST(String::from_deprecated_string(name_value_pair.name)));
+        names.append(name_value_pair.name.to_string());
     }
     return names;
 }
 
 // https://html.spec.whatwg.org/multipage/dom.html#dom-domstringmap-nameditem
-DeprecatedString DOMStringMap::determine_value_of_named_property(DeprecatedString const& name) const
+String DOMStringMap::determine_value_of_named_property(FlyString const& name) const
 {
     // To determine the value of a named property name for a DOMStringMap, return the value component of the name-value pair whose name component is name in the list returned from getting the
     // DOMStringMap's name-value pairs.
     auto name_value_pairs = get_name_value_pairs();
-    auto optional_value = name_value_pairs.first_matching([&name](NameValuePair& name_value_pair) {
+    auto optional_value = name_value_pairs.first_matching([&name](NameValuePair const& name_value_pair) {
         return name_value_pair.name == name;
     });
 
@@ -199,7 +199,7 @@ WebIDL::ExceptionOr<Bindings::LegacyPlatformObject::DidDeletionFail> DOMStringMa
 
 WebIDL::ExceptionOr<JS::Value> DOMStringMap::named_item_value(FlyString const& name) const
 {
-    return JS::PrimitiveString::create(vm(), determine_value_of_named_property(name.to_deprecated_fly_string()));
+    return JS::PrimitiveString::create(vm(), determine_value_of_named_property(name));
 }
 
 }
diff --git a/Userland/Libraries/LibWeb/HTML/DOMStringMap.h b/Userland/Libraries/LibWeb/HTML/DOMStringMap.h
index a857a1fbb5..13648b3f0b 100644
--- a/Userland/Libraries/LibWeb/HTML/DOMStringMap.h
+++ b/Userland/Libraries/LibWeb/HTML/DOMStringMap.h
@@ -22,7 +22,7 @@ public:
 
     virtual ~DOMStringMap() override;
 
-    DeprecatedString determine_value_of_named_property(DeprecatedString const&) const;
+    String determine_value_of_named_property(FlyString const&) const;
 
     virtual WebIDL::ExceptionOr<void> set_value_of_new_named_property(String const&, JS::Value) override;
     virtual WebIDL::ExceptionOr<void> set_value_of_existing_named_property(String const&, JS::Value) override;
@@ -52,8 +52,8 @@ private:
     virtual bool named_property_deleter_has_identifier() const override { return false; }
 
     struct NameValuePair {
-        DeprecatedString name;
-        DeprecatedString value;
+        FlyString name;
+        String value;
     };
 
     Vector<NameValuePair> get_name_value_pairs() const;