From 08fa5138875899ca809fe8ddd8b6cade9c47e24a Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Fri, 24 Mar 2023 17:45:25 +0000 Subject: LibWeb: Split ShadowStyleValue out of StyleValue.{h,cpp} --- Userland/Libraries/LibWeb/CMakeLists.txt | 1 + Userland/Libraries/LibWeb/CSS/ComputedValues.h | 1 + Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp | 1 + .../LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp | 1 + Userland/Libraries/LibWeb/CSS/StyleProperties.cpp | 1 + Userland/Libraries/LibWeb/CSS/StyleValue.cpp | 19 +------ Userland/Libraries/LibWeb/CSS/StyleValue.h | 45 ---------------- .../LibWeb/CSS/StyleValues/ShadowStyleValue.cpp | 32 +++++++++++ .../LibWeb/CSS/StyleValues/ShadowStyleValue.h | 62 ++++++++++++++++++++++ 9 files changed, 100 insertions(+), 63 deletions(-) create mode 100644 Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.cpp create mode 100644 Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.h (limited to 'Userland/Libraries') diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index d01584d731..8bd8b2bd67 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -92,6 +92,7 @@ set(SOURCES CSS/StyleValues/OverflowStyleValue.cpp CSS/StyleValues/PositionStyleValue.cpp CSS/StyleValues/RadialGradientStyleValue.cpp + CSS/StyleValues/ShadowStyleValue.cpp CSS/Supports.cpp CSS/SyntaxHighlighter/SyntaxHighlighter.cpp CSS/Time.cpp diff --git a/Userland/Libraries/LibWeb/CSS/ComputedValues.h b/Userland/Libraries/LibWeb/CSS/ComputedValues.h index 5c9ab79a8e..f503d380cd 100644 --- a/Userland/Libraries/LibWeb/CSS/ComputedValues.h +++ b/Userland/Libraries/LibWeb/CSS/ComputedValues.h @@ -13,6 +13,7 @@ #include #include #include +#include namespace Web::CSS { diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index a94a643752..924e8c374d 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp index e59c599585..086cb711b4 100644 --- a/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp +++ b/Userland/Libraries/LibWeb/CSS/ResolvedCSSStyleDeclaration.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp index 175e705f22..cf930a5cb3 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleProperties.cpp @@ -15,6 +15,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 02883f8ebc..b1dc817e27 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1146,15 +1147,6 @@ ErrorOr RectStyleValue::to_string() const return String::formatted("rect({} {} {} {})", m_rect.top_edge, m_rect.right_edge, m_rect.bottom_edge, m_rect.left_edge); } -ErrorOr ShadowStyleValue::to_string() const -{ - StringBuilder builder; - TRY(builder.try_appendff("{} {} {} {} {}", m_properties.color.to_deprecated_string(), TRY(m_properties.offset_x.to_string()), TRY(m_properties.offset_y.to_string()), TRY(m_properties.blur_radius.to_string()), TRY(m_properties.spread_distance.to_string()))); - if (m_properties.placement == ShadowPlacement::Inner) - TRY(builder.try_append(" inset"sv)); - return builder.to_string(); -} - ErrorOr TextDecorationStyleValue::to_string() const { return String::formatted("{} {} {} {}", TRY(m_properties.line->to_string()), TRY(m_properties.thickness->to_string()), TRY(m_properties.style->to_string()), TRY(m_properties.color->to_string())); @@ -1246,15 +1238,6 @@ ValueComparingNonnullRefPtr StyleValue::absolutized(CSSPixelRe return *this; } -ValueComparingNonnullRefPtr ShadowStyleValue::absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const -{ - auto absolutized_offset_x = absolutized_length(m_properties.offset_x, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_x); - auto absolutized_offset_y = absolutized_length(m_properties.offset_y, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_y); - auto absolutized_blur_radius = absolutized_length(m_properties.blur_radius, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.blur_radius); - auto absolutized_spread_distance = absolutized_length(m_properties.spread_distance, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.spread_distance); - return ShadowStyleValue::create(m_properties.color, absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, m_properties.placement); -} - bool CalculatedStyleValue::contains_percentage() const { return m_expression->contains_percentage(); diff --git a/Userland/Libraries/LibWeb/CSS/StyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValue.h index 1a51dd80d8..dc1649efb3 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.h @@ -52,11 +52,6 @@ enum class BackgroundSize { LengthPercentage, }; -enum class ShadowPlacement { - Outer, - Inner, -}; - enum class FlexBasis { Content, LengthPercentage, @@ -627,46 +622,6 @@ private: NonnullOwnPtr m_expression; }; -class ShadowStyleValue final : public StyleValueWithDefaultOperators { -public: - static ValueComparingNonnullRefPtr - create(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement) - { - return adopt_ref(*new ShadowStyleValue(color, offset_x, offset_y, blur_radius, spread_distance, placement)); - } - virtual ~ShadowStyleValue() override = default; - - Color color() const { return m_properties.color; } - Length const& offset_x() const { return m_properties.offset_x; } - Length const& offset_y() const { return m_properties.offset_y; } - Length const& blur_radius() const { return m_properties.blur_radius; } - Length const& spread_distance() const { return m_properties.spread_distance; } - ShadowPlacement placement() const { return m_properties.placement; } - - virtual ErrorOr to_string() const override; - - bool properties_equal(ShadowStyleValue const& other) const { return m_properties == other.m_properties; } - -private: - explicit ShadowStyleValue(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement) - : StyleValueWithDefaultOperators(Type::Shadow) - , m_properties { .color = color, .offset_x = offset_x, .offset_y = offset_y, .blur_radius = blur_radius, .spread_distance = spread_distance, .placement = placement } - { - } - - virtual ValueComparingNonnullRefPtr absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const override; - - struct Properties { - Color color; - Length offset_x; - Length offset_y; - Length blur_radius; - Length spread_distance; - ShadowPlacement placement; - bool operator==(Properties const&) const = default; - } m_properties; -}; - class StringStyleValue : public StyleValueWithDefaultOperators { public: static ValueComparingNonnullRefPtr create(String const& string) diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.cpp new file mode 100644 index 0000000000..ee75a2366e --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.cpp @@ -0,0 +1,32 @@ +/* + * 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 + */ + +#include "ShadowStyleValue.h" + +namespace Web::CSS { + +ErrorOr ShadowStyleValue::to_string() const +{ + StringBuilder builder; + TRY(builder.try_appendff("{} {} {} {} {}", m_properties.color.to_deprecated_string(), TRY(m_properties.offset_x.to_string()), TRY(m_properties.offset_y.to_string()), TRY(m_properties.blur_radius.to_string()), TRY(m_properties.spread_distance.to_string()))); + if (m_properties.placement == ShadowPlacement::Inner) + TRY(builder.try_append(" inset"sv)); + return builder.to_string(); +} + +ValueComparingNonnullRefPtr ShadowStyleValue::absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const +{ + auto absolutized_offset_x = absolutized_length(m_properties.offset_x, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_x); + auto absolutized_offset_y = absolutized_length(m_properties.offset_y, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.offset_y); + auto absolutized_blur_radius = absolutized_length(m_properties.blur_radius, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.blur_radius); + auto absolutized_spread_distance = absolutized_length(m_properties.spread_distance, viewport_rect, font_metrics, font_size, root_font_size, line_height, root_line_height).value_or(m_properties.spread_distance); + return ShadowStyleValue::create(m_properties.color, absolutized_offset_x, absolutized_offset_y, absolutized_blur_radius, absolutized_spread_distance, m_properties.placement); +} + +} diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.h new file mode 100644 index 0000000000..3af4ec7bbb --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ShadowStyleValue.h @@ -0,0 +1,62 @@ +/* + * 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 +#include +#include + +namespace Web::CSS { + +enum class ShadowPlacement { + Outer, + Inner, +}; + +class ShadowStyleValue final : public StyleValueWithDefaultOperators { +public: + static ValueComparingNonnullRefPtr create(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement) + { + return adopt_ref(*new ShadowStyleValue(color, offset_x, offset_y, blur_radius, spread_distance, placement)); + } + virtual ~ShadowStyleValue() override = default; + + Color color() const { return m_properties.color; } + Length const& offset_x() const { return m_properties.offset_x; } + Length const& offset_y() const { return m_properties.offset_y; } + Length const& blur_radius() const { return m_properties.blur_radius; } + Length const& spread_distance() const { return m_properties.spread_distance; } + ShadowPlacement placement() const { return m_properties.placement; } + + virtual ErrorOr to_string() const override; + + bool properties_equal(ShadowStyleValue const& other) const { return m_properties == other.m_properties; } + +private: + explicit ShadowStyleValue(Color color, Length const& offset_x, Length const& offset_y, Length const& blur_radius, Length const& spread_distance, ShadowPlacement placement) + : StyleValueWithDefaultOperators(Type::Shadow) + , m_properties { .color = color, .offset_x = offset_x, .offset_y = offset_y, .blur_radius = blur_radius, .spread_distance = spread_distance, .placement = placement } + { + } + + virtual ValueComparingNonnullRefPtr absolutized(CSSPixelRect const& viewport_rect, Gfx::FontPixelMetrics const& font_metrics, CSSPixels font_size, CSSPixels root_font_size, CSSPixels line_height, CSSPixels root_line_height) const override; + + struct Properties { + Color color; + Length offset_x; + Length offset_y; + Length blur_radius; + Length spread_distance; + ShadowPlacement placement; + bool operator==(Properties const&) const = default; + } m_properties; +}; + +} -- cgit v1.2.3