system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-09-20 00:12:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sam Atkins 2023-03-24 17:52:37 +00:00 committed by Linus Groh
parent 9b834058ee
commit 66cb7edffb
7 changed files with 80 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,6 +93,7 @@ set(SOURCES
CSS/StyleValues/PositionStyleValue.cpp
CSS/StyleValues/RadialGradientStyleValue.cpp
CSS/StyleValues/ShadowStyleValue.cpp
CSS/StyleValues/TextDecorationStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
CSS/Time.cpp

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

@ -64,6 +64,7 @@
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
#include <LibWeb/CSS/StyleValues/TextDecorationStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Infra/Strings.h>

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

@ -43,6 +43,7 @@
#include <LibWeb/CSS/StyleValues/NumericStyleValue.h>
#include <LibWeb/CSS/StyleValues/OverflowStyleValue.h>
#include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
#include <LibWeb/CSS/StyleValues/TextDecorationStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>
#include <LibWeb/FontCache.h>

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

@ -47,6 +47,7 @@
#include <LibWeb/CSS/StyleValues/ResolutionStyleValue.h>
#include <LibWeb/CSS/StyleValues/ShadowStyleValue.h>
#include <LibWeb/CSS/StyleValues/StringStyleValue.h>
#include <LibWeb/CSS/StyleValues/TextDecorationStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/BrowsingContext.h>
#include <LibWeb/Loader/LoadRequest.h>
@ -1148,11 +1149,6 @@ ErrorOr<String> 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<String> 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()));
}
ErrorOr<String> TransformationStyleValue::to_string() const
{
StringBuilder builder;

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

@ -622,47 +622,6 @@ private:
NonnullOwnPtr<CalcSum> m_expression;
};
class TextDecorationStyleValue final : public StyleValueWithDefaultOperators<TextDecorationStyleValue> {
public:
static ValueComparingNonnullRefPtr<TextDecorationStyleValue> create(
ValueComparingNonnullRefPtr<StyleValue> line,
ValueComparingNonnullRefPtr<StyleValue> thickness,
ValueComparingNonnullRefPtr<StyleValue> style,
ValueComparingNonnullRefPtr<StyleValue> color)
{
return adopt_ref(*new TextDecorationStyleValue(move(line), move(thickness), move(style), move(color)));
}
virtual ~TextDecorationStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> line() const { return m_properties.line; }
ValueComparingNonnullRefPtr<StyleValue> thickness() const { return m_properties.thickness; }
ValueComparingNonnullRefPtr<StyleValue> style() const { return m_properties.style; }
ValueComparingNonnullRefPtr<StyleValue> color() const { return m_properties.color; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(TextDecorationStyleValue const& other) const { return m_properties == other.m_properties; }
private:
TextDecorationStyleValue(
ValueComparingNonnullRefPtr<StyleValue> line,
ValueComparingNonnullRefPtr<StyleValue> thickness,
ValueComparingNonnullRefPtr<StyleValue> style,
ValueComparingNonnullRefPtr<StyleValue> color)
: StyleValueWithDefaultOperators(Type::TextDecoration)
, m_properties { .line = move(line), .thickness = move(thickness), .style = move(style), .color = move(color) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> line;
ValueComparingNonnullRefPtr<StyleValue> thickness;
ValueComparingNonnullRefPtr<StyleValue> style;
ValueComparingNonnullRefPtr<StyleValue> color;
bool operator==(Properties const&) const = default;
} m_properties;
};
class TimeStyleValue : public StyleValueWithDefaultOperators<TimeStyleValue> {
public:
static ValueComparingNonnullRefPtr<TimeStyleValue> create(Time time)

19
Userland/Libraries/LibWeb/CSS/StyleValues/TextDecorationStyleValue.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 "TextDecorationStyleValue.h"
namespace Web::CSS {
ErrorOr<String> 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()));
}
}

57
Userland/Libraries/LibWeb/CSS/StyleValues/TextDecorationStyleValue.h Normal file
View file

@ -0,0 +1,57 @@
/*
* 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 TextDecorationStyleValue final : public StyleValueWithDefaultOperators<TextDecorationStyleValue> {
public:
static ValueComparingNonnullRefPtr<TextDecorationStyleValue> create(
ValueComparingNonnullRefPtr<StyleValue> line,
ValueComparingNonnullRefPtr<StyleValue> thickness,
ValueComparingNonnullRefPtr<StyleValue> style,
ValueComparingNonnullRefPtr<StyleValue> color)
{
return adopt_ref(*new TextDecorationStyleValue(move(line), move(thickness), move(style), move(color)));
}
virtual ~TextDecorationStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> line() const { return m_properties.line; }
ValueComparingNonnullRefPtr<StyleValue> thickness() const { return m_properties.thickness; }
ValueComparingNonnullRefPtr<StyleValue> style() const { return m_properties.style; }
ValueComparingNonnullRefPtr<StyleValue> color() const { return m_properties.color; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(TextDecorationStyleValue const& other) const { return m_properties == other.m_properties; }
private:
TextDecorationStyleValue(
ValueComparingNonnullRefPtr<StyleValue> line,
ValueComparingNonnullRefPtr<StyleValue> thickness,
ValueComparingNonnullRefPtr<StyleValue> style,
ValueComparingNonnullRefPtr<StyleValue> color)
: StyleValueWithDefaultOperators(Type::TextDecoration)
, m_properties { .line = move(line), .thickness = move(thickness), .style = move(style), .color = move(color) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> line;
ValueComparingNonnullRefPtr<StyleValue> thickness;
ValueComparingNonnullRefPtr<StyleValue> style;
ValueComparingNonnullRefPtr<StyleValue> color;
bool operator==(Properties const&) const = default;
} m_properties;
};
}