diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn index b879158fa9..1245584a4e 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/CSS/StyleValues/BUILD.gn @@ -24,7 +24,6 @@ source_set("StyleValues") { "IntegerStyleValue.cpp", "LengthStyleValue.cpp", "LinearGradientStyleValue.cpp", - "ListStyleStyleValue.cpp", "MathDepthStyleValue.cpp", "NumberStyleValue.cpp", "OverflowStyleValue.cpp", diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 3fe8653144..25d28fa0bb 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -101,7 +101,6 @@ set(SOURCES CSS/StyleValues/IntegerStyleValue.cpp CSS/StyleValues/LengthStyleValue.cpp CSS/StyleValues/LinearGradientStyleValue.cpp - CSS/StyleValues/ListStyleStyleValue.cpp CSS/StyleValues/MathDepthStyleValue.cpp CSS/StyleValues/NumberStyleValue.cpp CSS/StyleValues/OverflowStyleValue.cpp diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 6f6c9f6f59..ce34e7284c 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -57,7 +57,6 @@ #include #include #include -#include #include #include #include @@ -4498,7 +4497,9 @@ RefPtr Parser::parse_list_style_value(Vector const& if (!list_type) list_type = property_initial_value(m_context.realm(), PropertyID::ListStyleType); - return ListStyleStyleValue::create(list_position.release_nonnull(), list_image.release_nonnull(), list_type.release_nonnull()); + return ShorthandStyleValue::create(PropertyID::ListStyle, + { PropertyID::ListStylePosition, PropertyID::ListStyleImage, PropertyID::ListStyleType }, + { list_position.release_nonnull(), list_image.release_nonnull(), list_type.release_nonnull() }); } RefPtr Parser::parse_math_depth_value(Vector const& component_values) diff --git a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp index 2aa5952bdf..7d628c6b6d 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleComputer.cpp @@ -42,7 +42,6 @@ #include #include #include -#include #include #include #include @@ -705,14 +704,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::ListStyle) { - if (value.is_list_style()) { - auto const& list_style = value.as_list_style(); - set_longhand_property(CSS::PropertyID::ListStylePosition, list_style.position()); - set_longhand_property(CSS::PropertyID::ListStyleImage, list_style.image()); - set_longhand_property(CSS::PropertyID::ListStyleType, list_style.style_type()); - return; - } - set_longhand_property(CSS::PropertyID::ListStylePosition, value); set_longhand_property(CSS::PropertyID::ListStyleImage, value); set_longhand_property(CSS::PropertyID::ListStyleType, value); diff --git a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp index f7ac708b92..2eaa36ce8c 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValue.h index 2759f98ad1..b2363eb069 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValue.h +++ b/Userland/Libraries/LibWeb/CSS/StyleValue.h @@ -109,7 +109,6 @@ using StyleValueVector = Vector>; __ENUMERATE_STYLE_VALUE_TYPE(Integer, integer) \ __ENUMERATE_STYLE_VALUE_TYPE(Length, length) \ __ENUMERATE_STYLE_VALUE_TYPE(LinearGradient, linear_gradient) \ - __ENUMERATE_STYLE_VALUE_TYPE(ListStyle, list_style) \ __ENUMERATE_STYLE_VALUE_TYPE(MathDepth, math_depth) \ __ENUMERATE_STYLE_VALUE_TYPE(Number, number) \ __ENUMERATE_STYLE_VALUE_TYPE(Overflow, overflow) \ diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.cpp deleted file mode 100644 index 5edf9bc352..0000000000 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.cpp +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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 "ListStyleStyleValue.h" - -namespace Web::CSS { - -String ListStyleStyleValue::to_string() const -{ - return MUST(String::formatted("{} {} {}", m_properties.position->to_string(), m_properties.image->to_string(), m_properties.style_type->to_string())); -} - -} diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.h b/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.h deleted file mode 100644 index 1ae7f06a15..0000000000 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 ListStyleStyleValue final : public StyleValueWithDefaultOperators { -public: - static ValueComparingNonnullRefPtr create( - ValueComparingNonnullRefPtr position, - ValueComparingNonnullRefPtr image, - ValueComparingNonnullRefPtr style_type) - { - return adopt_ref(*new (nothrow) ListStyleStyleValue(move(position), move(image), move(style_type))); - } - virtual ~ListStyleStyleValue() override = default; - - ValueComparingNonnullRefPtr position() const { return m_properties.position; } - ValueComparingNonnullRefPtr image() const { return m_properties.image; } - ValueComparingNonnullRefPtr style_type() const { return m_properties.style_type; } - - virtual String to_string() const override; - - bool properties_equal(ListStyleStyleValue const& other) const { return m_properties == other.m_properties; } - -private: - ListStyleStyleValue( - ValueComparingNonnullRefPtr position, - ValueComparingNonnullRefPtr image, - ValueComparingNonnullRefPtr style_type) - : StyleValueWithDefaultOperators(Type::ListStyle) - , m_properties { .position = move(position), .image = move(image), .style_type = move(style_type) } - { - } - - struct Properties { - ValueComparingNonnullRefPtr position; - ValueComparingNonnullRefPtr image; - ValueComparingNonnullRefPtr style_type; - bool operator==(Properties const&) const = default; - } m_properties; -}; - -} diff --git a/Userland/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp b/Userland/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp index dafe585064..8299b640ac 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleValues/ShorthandStyleValue.cpp @@ -145,6 +145,8 @@ String ShorthandStyleValue::to_string() const return MUST(String::formatted("{}", construct_rows_string())); return MUST(String::formatted("{} / {}", construct_rows_string(), columns.grid_track_size_list().to_string())); } + case PropertyID::ListStyle: + return MUST(String::formatted("{} {} {}", longhand(PropertyID::ListStylePosition)->to_string(), longhand(PropertyID::ListStyleImage)->to_string(), longhand(PropertyID::ListStyleType)->to_string())); default: StringBuilder builder; auto first = true; diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index e3ee01eb50..5816c1d057 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -127,7 +127,6 @@ class LengthOrCalculated; class LengthPercentage; class LengthStyleValue; class LinearGradientStyleValue; -class ListStyleStyleValue; class MathDepthStyleValue; class MediaFeatureValue; class MediaList;