RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-24 03:25:06 +00:00
Code Issues Activity Actions

LibWeb: Split ListStyleStyleValue out of StyleValue.{h,cpp}

Browse source
This commit is contained in:
Sam Atkins 2023-03-24 17:07:57 +00:00 • committed by Linus Groh
parent 9a84151169
commit fba2dacc7a
7 changed files with 76 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -87,6 +87,7 @@ set(SOURCES
CSS/StyleValues/ImageStyleValue.cpp
CSS/StyleValues/LengthStyleValue.cpp
CSS/StyleValues/LinearGradientStyleValue.cpp
CSS/StyleValues/ListStyleStyleValue.cpp
CSS/StyleValues/RadialGradientStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp

1
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -55,6 +55,7 @@
#include <LibWeb/CSS/StyleValues/InitialStyleValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
#include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>

1
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -39,6 +39,7 @@
#include <LibWeb/CSS/StyleValues/GridTrackPlacementStyleValue.h>
#include <LibWeb/CSS/StyleValues/IdentifierStyleValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
#include <LibWeb/FontCache.h>

6
Userland/Libraries/LibWeb/CSS/StyleValue.cpp
View file

@ -38,6 +38,7 @@
#include <LibWeb/CSS/StyleValues/InitialStyleValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/LinearGradientStyleValue.h>
#include <LibWeb/CSS/StyleValues/ListStyleStyleValue.h>
#include <LibWeb/CSS/StyleValues/RadialGradientStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/BrowsingContext.h>
@ -1135,11 +1136,6 @@ ErrorOr<void> PositionValue::serialize(StringBuilder& builder) const
return {};
}
ErrorOr<String> ListStyleStyleValue::to_string() const
{
return String::formatted("{} {} {}", TRY(m_properties.position->to_string()), TRY(m_properties.image->to_string()), TRY(m_properties.style_type->to_string()));
}
ErrorOr<String> NumericStyleValue::to_string() const
{
return m_value.visit(

37
Userland/Libraries/LibWeb/CSS/StyleValue.h
View file

@ -627,43 +627,6 @@ private:
NonnullOwnPtr<CalcSum> m_expression;
};
class ListStyleStyleValue final : public StyleValueWithDefaultOperators<ListStyleStyleValue> {
public:
static ValueComparingNonnullRefPtr<ListStyleStyleValue> create(
ValueComparingNonnullRefPtr<StyleValue> position,
ValueComparingNonnullRefPtr<StyleValue> image,
ValueComparingNonnullRefPtr<StyleValue> style_type)
{
return adopt_ref(*new ListStyleStyleValue(move(position), move(image), move(style_type)));
}
virtual ~ListStyleStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> position() const { return m_properties.position; }
ValueComparingNonnullRefPtr<StyleValue> image() const { return m_properties.image; }
ValueComparingNonnullRefPtr<StyleValue> style_type() const { return m_properties.style_type; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(ListStyleStyleValue const& other) const { return m_properties == other.m_properties; }
private:
ListStyleStyleValue(
ValueComparingNonnullRefPtr<StyleValue> position,
ValueComparingNonnullRefPtr<StyleValue> image,
ValueComparingNonnullRefPtr<StyleValue> style_type)
: StyleValueWithDefaultOperators(Type::ListStyle)
, m_properties { .position = move(position), .image = move(image), .style_type = move(style_type) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> position;
ValueComparingNonnullRefPtr<StyleValue> image;
ValueComparingNonnullRefPtr<StyleValue> style_type;
bool operator==(Properties const&) const = default;
} m_properties;
};
class NumericStyleValue : public StyleValueWithDefaultOperators<NumericStyleValue> {
public:
static ValueComparingNonnullRefPtr<NumericStyleValue> create_float(float value)

19
Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.cpp Normal file
View file

@ -0,0 +1,19 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
* Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "ListStyleStyleValue.h"
namespace Web::CSS {
ErrorOr<String> ListStyleStyleValue::to_string() const
{
return String::formatted("{} {} {}", TRY(m_properties.position->to_string()), TRY(m_properties.image->to_string()), TRY(m_properties.style_type->to_string()));
}
}

53
Userland/Libraries/LibWeb/CSS/StyleValues/ListStyleStyleValue.h Normal file
View file

@ -0,0 +1,53 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
* Copyright (c) 2021-2023, Sam Atkins <atkinssj@serenityos.org>
* Copyright (c) 2022-2023, MacDue <macdue@dueutil.tech>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <LibWeb/CSS/StyleValue.h>
namespace Web::CSS {
class ListStyleStyleValue final : public StyleValueWithDefaultOperators<ListStyleStyleValue> {
public:
static ValueComparingNonnullRefPtr<ListStyleStyleValue> create(
ValueComparingNonnullRefPtr<StyleValue> position,
ValueComparingNonnullRefPtr<StyleValue> image,
ValueComparingNonnullRefPtr<StyleValue> style_type)
{
return adopt_ref(*new ListStyleStyleValue(move(position), move(image), move(style_type)));
}
virtual ~ListStyleStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> position() const { return m_properties.position; }
ValueComparingNonnullRefPtr<StyleValue> image() const { return m_properties.image; }
ValueComparingNonnullRefPtr<StyleValue> style_type() const { return m_properties.style_type; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(ListStyleStyleValue const& other) const { return m_properties == other.m_properties; }
private:
ListStyleStyleValue(
ValueComparingNonnullRefPtr<StyleValue> position,
ValueComparingNonnullRefPtr<StyleValue> image,
ValueComparingNonnullRefPtr<StyleValue> style_type)
: StyleValueWithDefaultOperators(Type::ListStyle)
, m_properties { .position = move(position), .image = move(image), .style_type = move(style_type) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> position;
ValueComparingNonnullRefPtr<StyleValue> image;
ValueComparingNonnullRefPtr<StyleValue> style_type;
bool operator==(Properties const&) const = default;
} m_properties;
};
}