From 4bf59c59bbb8e4636afe506f23a06200c92df75d Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Fri, 24 Mar 2023 23:56:56 +0000 Subject: [PATCH] LibWeb: Split UnsetStyleValue out of StyleValue.{h,cpp} --- .../Libraries/LibWeb/CSS/Parser/Parser.cpp | 1 + Userland/Libraries/LibWeb/CSS/StyleValue.cpp | 1 + Userland/Libraries/LibWeb/CSS/StyleValue.h | 20 ----------- .../LibWeb/CSS/StyleValues/UnsetStyleValue.h | 36 +++++++++++++++++++ 4 files changed, 38 insertions(+), 20 deletions(-) create mode 100644 Userland/Libraries/LibWeb/CSS/StyleValues/UnsetStyleValue.h diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index f5b16eef54..def048cbbb 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -68,6 +68,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp index aa259167be..2ae512e95a 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp @@ -51,6 +51,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValue.h index bb8d0af38a..080920fc89 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.h @@ -622,26 +622,6 @@ private: NonnullOwnPtr m_expression; }; -class UnsetStyleValue final : public StyleValueWithDefaultOperators { -public: - static ValueComparingNonnullRefPtr the() - { - static ValueComparingNonnullRefPtr instance = adopt_ref(*new UnsetStyleValue); - return instance; - } - virtual ~UnsetStyleValue() override = default; - - ErrorOr to_string() const override { return "unset"_string; } - - bool properties_equal(UnsetStyleValue const&) const { return true; } - -private: - UnsetStyleValue() - : StyleValueWithDefaultOperators(Type::Unset) - { - } -}; - class StyleValueList final : public StyleValueWithDefaultOperators { public: enum class Separator { diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/UnsetStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/UnsetStyleValue.h new file mode 100644 index 0000000000..28aba45ff3 --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/UnsetStyleValue.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2021, Tobias Christiansen + * Copyright (c) 2021-2023, Sam Atkins + * Copyright (c) 2022-2023, MacDue + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace Web::CSS { + +class UnsetStyleValue final : public StyleValueWithDefaultOperators { +public: + static ValueComparingNonnullRefPtr the() + { + static ValueComparingNonnullRefPtr instance = adopt_ref(*new UnsetStyleValue); + return instance; + } + virtual ~UnsetStyleValue() override = default; + + ErrorOr to_string() const override { return "unset"_string; } + + bool properties_equal(UnsetStyleValue const&) const { return true; } + +private: + UnsetStyleValue() + : StyleValueWithDefaultOperators(Type::Unset) + { + } +}; + +}