RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:37:46 +00:00
Code Issues Activity Actions

LibWeb: Port CSSConditionRule interface from DeprecatedString to String

Browse source
This commit is contained in:
Shannon Booth 2023-08-26 17:28:31 +12:00 • committed by Andrew Kaster
parent ff45874d4e
commit cf733d309e
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/CSS/CSSConditionRule.h
View file

@ -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;

2
Userland/Libraries/LibWeb/CSS/CSSConditionRule.idl
View file

@ -1,6 +1,6 @@
#import <CSS/CSSGroupingRule.idl>
[Exposed=Window]
[Exposed=Window, UseNewAKString]
interface CSSConditionRule : CSSGroupingRule {
attribute CSSOMString conditionText;
};

6
Userland/Libraries/LibWeb/CSS/CSSMediaRule.cpp
View file

@ -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);
}

4
Userland/Libraries/LibWeb/CSS/CSSMediaRule.h
View file

@ -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; }

6
Userland/Libraries/LibWeb/CSS/CSSSupportsRule.cpp
View file

@ -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();

4
Userland/Libraries/LibWeb/CSS/CSSSupportsRule.h
View file

@ -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: