From ff45874d4eeb2db66d156f1ff2e1a3b8f2462f11 Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Sat, 26 Aug 2023 17:24:11 +1200
Subject: [PATCH] LibWeb: Port MediaList interface from DeprecatedString to
 String

---
 Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp |  2 +-
 Userland/Libraries/LibWeb/CSS/MediaList.cpp    | 14 +++++++-------
 Userland/Libraries/LibWeb/CSS/MediaList.h      | 10 +++++-----
 Userland/Libraries/LibWeb/CSS/MediaList.idl    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
index b21fcecd06..f65bcd2649 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
+++ b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
@@ -37,7 +37,7 @@ void CSSMediaRule::visit_edges(Cell::Visitor& visitor)
 
 DeprecatedString CSSMediaRule::condition_text() const
 {
-    return m_media->media_text();
+    return m_media->media_text().to_deprecated_string();
 }
 
 void CSSMediaRule::set_condition_text(DeprecatedString text)
diff --git a/Userland/Libraries/LibWeb/CSS/MediaList.cpp b/Userland/Libraries/LibWeb/CSS/MediaList.cpp
index 7227472324..7deb563cc9 100644
--- a/Userland/Libraries/LibWeb/CSS/MediaList.cpp
+++ b/Userland/Libraries/LibWeb/CSS/MediaList.cpp
@@ -31,13 +31,13 @@ void MediaList::initialize(JS::Realm& realm)
 }
 
 // https://www.w3.org/TR/cssom-1/#dom-medialist-mediatext
-DeprecatedString MediaList::media_text() const
+String MediaList::media_text() const
 {
-    return serialize_a_media_query_list(m_media).to_deprecated_string();
+    return serialize_a_media_query_list(m_media);
 }
 
 // https://www.w3.org/TR/cssom-1/#dom-medialist-mediatext
-void MediaList::set_media_text(DeprecatedString const& text)
+void MediaList::set_media_text(StringView text)
 {
     m_media.clear();
     if (text.is_empty())
@@ -51,16 +51,16 @@ bool MediaList::is_supported_property_index(u32 index) const
 }
 
 // https://www.w3.org/TR/cssom-1/#dom-medialist-item
-DeprecatedString MediaList::item(u32 index) const
+Optional<String> MediaList::item(u32 index) const
 {
     if (!is_supported_property_index(index))
         return {};
 
-    return m_media[index]->to_string().to_deprecated_string();
+    return m_media[index]->to_string();
 }
 
 // https://www.w3.org/TR/cssom-1/#dom-medialist-appendmedium
-void MediaList::append_medium(DeprecatedString medium)
+void MediaList::append_medium(StringView medium)
 {
     // 1. Let m be the result of parsing the given value.
     auto m = parse_media_query(Parser::ParsingContext { realm() }, medium);
@@ -81,7 +81,7 @@ void MediaList::append_medium(DeprecatedString medium)
 }
 
 // https://www.w3.org/TR/cssom-1/#dom-medialist-deletemedium
-void MediaList::delete_medium(DeprecatedString medium)
+void MediaList::delete_medium(StringView medium)
 {
     auto m = parse_media_query(Parser::ParsingContext { realm() }, medium);
     if (!m)
diff --git a/Userland/Libraries/LibWeb/CSS/MediaList.h b/Userland/Libraries/LibWeb/CSS/MediaList.h
index d68a732351..d5f0a027c1 100644
--- a/Userland/Libraries/LibWeb/CSS/MediaList.h
+++ b/Userland/Libraries/LibWeb/CSS/MediaList.h
@@ -23,12 +23,12 @@ public:
     [[nodiscard]] static JS::NonnullGCPtr<MediaList> create(JS::Realm&, Vector<NonnullRefPtr<MediaQuery>>&&);
     ~MediaList() = default;
 
-    DeprecatedString media_text() const;
-    void set_media_text(DeprecatedString const&);
+    String media_text() const;
+    void set_media_text(StringView);
     size_t length() const { return m_media.size(); }
-    DeprecatedString item(u32 index) const;
-    void append_medium(DeprecatedString);
-    void delete_medium(DeprecatedString);
+    Optional<String> item(u32 index) const;
+    void append_medium(StringView);
+    void delete_medium(StringView);
 
     virtual bool is_supported_property_index(u32 index) const override;
     virtual WebIDL::ExceptionOr<JS::Value> item_value(size_t index) const override;
diff --git a/Userland/Libraries/LibWeb/CSS/MediaList.idl b/Userland/Libraries/LibWeb/CSS/MediaList.idl
index 63eb6bfc5a..ac74c4af56 100644
--- a/Userland/Libraries/LibWeb/CSS/MediaList.idl
+++ b/Userland/Libraries/LibWeb/CSS/MediaList.idl
@@ -1,4 +1,4 @@
-[Exposed=Window]
+[Exposed=Window, UseNewAKString]
 interface MediaList {
     [LegacyNullToEmptyString] stringifier attribute CSSOMString mediaText;
     readonly attribute unsigned long length;