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

---
 Userland/Libraries/LibWeb/CSS/CSSConditionRule.h   | 4 ++--
 Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl | 2 +-
 Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp     | 6 +++---
 Userland/Libraries/LibWeb/CSS/CSSMediaRule.h       | 4 ++--
 Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp  | 6 +++---
 Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h    | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Userland/Libraries/LibWeb/CSS/CSSConditionRule.h b/Userland/Libraries/LibWeb/CSS/CSSConditionRule.h
index f2c16810e8..ebc7505f03 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSConditionRule.h
+++ b/Userland/Libraries/LibWeb/CSS/CSSConditionRule.h
@@ -18,8 +18,8 @@ class CSSConditionRule : public CSSGroupingRule {
 public:
     virtual ~CSSConditionRule() = default;
 
-    virtual DeprecatedString condition_text() const = 0;
-    virtual void set_condition_text(DeprecatedString) = 0;
+    virtual String condition_text() const = 0;
+    virtual void set_condition_text(String const&) = 0;
     virtual bool condition_matches() const = 0;
 
     virtual void for_each_effective_style_rule(Function<void(CSSStyleRule const&)> const& callback) const override;
diff --git a/Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl b/Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl
index 73c336eaaa..320e10db0e 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl
+++ b/Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl
@@ -1,6 +1,6 @@
 #import <CSS/CSSGroupingRule.idl>
 
-[Exposed=Window]
+[Exposed=Window, UseNewAKString]
 interface CSSConditionRule : CSSGroupingRule {
     attribute CSSOMString conditionText;
 };
diff --git a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
index f65bcd2649..51511acea4 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
+++ b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
@@ -35,12 +35,12 @@ void CSSMediaRule::visit_edges(Cell::Visitor& visitor)
     visitor.visit(m_media);
 }
 
-DeprecatedString CSSMediaRule::condition_text() const
+String CSSMediaRule::condition_text() const
 {
-    return m_media->media_text().to_deprecated_string();
+    return String::from_deprecated_string(m_media->media_text().to_deprecated_string()).release_value();
 }
 
-void CSSMediaRule::set_condition_text(DeprecatedString text)
+void CSSMediaRule::set_condition_text(String const& text)
 {
     m_media->set_media_text(text);
 }
diff --git a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h
index ce3a496168..80e07fce75 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h
+++ b/Userland/Libraries/LibWeb/CSS/CSSMediaRule.h
@@ -24,8 +24,8 @@ public:
 
     virtual Type type() const override { return Type::Media; }
 
-    virtual DeprecatedString condition_text() const override;
-    virtual void set_condition_text(DeprecatedString) override;
+    virtual String condition_text() const override;
+    virtual void set_condition_text(String const&) override;
     virtual bool condition_matches() const override { return m_media->matches(); }
 
     MediaList* media() const { return m_media; }
diff --git a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp
index 901cdb3396..80b8ee9b07 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp
+++ b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp
@@ -28,12 +28,12 @@ void CSSSupportsRule::initialize(JS::Realm& realm)
     set_prototype(&Bindings::ensure_web_prototype<Bindings::CSSSupportsRulePrototype>(realm, "CSSSupportsRule"));
 }
 
-DeprecatedString CSSSupportsRule::condition_text() const
+String CSSSupportsRule::condition_text() const
 {
-    return m_supports->to_string().to_deprecated_string();
+    return m_supports->to_string();
 }
 
-void CSSSupportsRule::set_condition_text(DeprecatedString text)
+void CSSSupportsRule::set_condition_text(String const& text)
 {
     if (auto new_supports = parse_css_supports(Parser::ParsingContext { realm() }, text))
         m_supports = new_supports.release_nonnull();
diff --git a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h
index acc19052e8..a5e195cb15 100644
--- a/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h
+++ b/Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h
@@ -25,8 +25,8 @@ public:
 
     virtual Type type() const override { return Type::Supports; }
 
-    DeprecatedString condition_text() const override;
-    void set_condition_text(DeprecatedString) override;
+    String condition_text() const override;
+    void set_condition_text(String const&) override;
     virtual bool condition_matches() const override { return m_supports->matches(); }
 
 private: