From 6cedf5e05b3a36c2678c37f346559f4dbd8a9436 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Fri, 24 Mar 2023 17:40:28 +0000 Subject: [PATCH] LibWeb: Split ResolutionStyleValue 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 | 24 ------------ .../CSS/StyleValues/ResolutionStyleValue.h | 38 +++++++++++++++++++ 4 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 Userland/Libraries/LibWeb/CSS/StyleValues/ResolutionStyleValue.h diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 7f716df634..a94a643752 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -61,6 +61,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 1e42bc81b4..02883f8ebc 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp @@ -44,6 +44,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 847f74b179..1a51dd80d8 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.h @@ -627,30 +627,6 @@ private: NonnullOwnPtr m_expression; }; -class ResolutionStyleValue : public StyleValueWithDefaultOperators { -public: - static ValueComparingNonnullRefPtr create(Resolution resolution) - { - return adopt_ref(*new ResolutionStyleValue(move(resolution))); - } - virtual ~ResolutionStyleValue() override { } - - Resolution const& resolution() const { return m_resolution; } - - virtual ErrorOr to_string() const override { return m_resolution.to_string(); } - - bool properties_equal(ResolutionStyleValue const& other) const { return m_resolution == other.m_resolution; } - -private: - explicit ResolutionStyleValue(Resolution resolution) - : StyleValueWithDefaultOperators(Type::Resolution) - , m_resolution(move(resolution)) - { - } - - Resolution m_resolution; -}; - class ShadowStyleValue final : public StyleValueWithDefaultOperators { public: static ValueComparingNonnullRefPtr diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ResolutionStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/ResolutionStyleValue.h new file mode 100644 index 0000000000..f609db9176 --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ResolutionStyleValue.h @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2022-2023, Sam Atkins + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +namespace Web::CSS { + +class ResolutionStyleValue : public StyleValueWithDefaultOperators { +public: + static ValueComparingNonnullRefPtr create(Resolution resolution) + { + return adopt_ref(*new ResolutionStyleValue(move(resolution))); + } + virtual ~ResolutionStyleValue() override = default; + + Resolution const& resolution() const { return m_resolution; } + + virtual ErrorOr to_string() const override { return m_resolution.to_string(); } + + bool properties_equal(ResolutionStyleValue const& other) const { return m_resolution == other.m_resolution; } + +private: + explicit ResolutionStyleValue(Resolution resolution) + : StyleValueWithDefaultOperators(Type::Resolution) + , m_resolution(move(resolution)) + { + } + + Resolution m_resolution; +}; + +}