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

LibWeb: Port CSS::Supports to new Strings

Browse source
This commit is contained in:
Sam Atkins 2023-02-14 20:03:49 +00:00 • committed by Tim Flynn
parent fc3540c4b1
commit a381ce9519
4 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Libraries/LibWeb/CSS/Supports.h
View file

@ -1,14 +1,14 @@
/*
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/RefCounted.h>
#include <AK/String.h>
#include <AK/Variant.h>
#include <AK/Vector.h>
#include <LibWeb/CSS/GeneralEnclosed.h>
@ -22,21 +22,21 @@ class Supports final : public RefCounted<Supports> {
public:
struct Declaration {
DeprecatedString declaration;
String declaration;
bool evaluate() const;
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
};
struct Selector {
DeprecatedString selector;
String selector;
bool evaluate() const;
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
};
struct Feature {
Variant<Declaration, Selector> value;
bool evaluate() const;
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
};
struct Condition;
@ -44,7 +44,7 @@ public:
Variant<NonnullOwnPtr<Condition>, Feature, GeneralEnclosed> value;
bool evaluate() const;
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
};
struct Condition {
@ -57,7 +57,7 @@ public:
Vector<InParens> children;
bool evaluate() const;
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
};
static NonnullRefPtr<Supports> create(NonnullOwnPtr<Condition>&& condition)
@ -66,7 +66,7 @@ public:
}
bool matches() const { return m_matches; }
DeprecatedString to_deprecated_string() const;
ErrorOr<String> to_string() const;
private:
Supports(NonnullOwnPtr<Condition>&&);
@ -81,6 +81,6 @@ template<>
struct AK::Formatter<Web::CSS::Supports::InParens> : AK::Formatter<StringView> {
ErrorOr<void> format(FormatBuilder& builder, Web::CSS::Supports::InParens const& in_parens)
{
return Formatter<StringView>::format(builder, in_parens.to_deprecated_string());
return Formatter<StringView>::format(builder, TRY(in_parens.to_string()));
}
};