RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 23:17:45 +00:00
Code Issues Activity Actions

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

Browse source
This commit is contained in:
Sam Atkins 2023-03-23 21:17:43 +00:00 • committed by Linus Groh
parent 77b2826402
commit 9436b7de83
7 changed files with 73 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ set(SOURCES
CSS/StyleValues/BorderRadiusStyleValue.cpp
CSS/StyleValues/BorderStyleValue.cpp
CSS/StyleValues/ColorStyleValue.cpp
CSS/StyleValues/ContentStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
CSS/Time.cpp

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

@ -37,6 +37,7 @@
#include <LibWeb/CSS/StyleValues/BorderRadiusStyleValue.h>
#include <LibWeb/CSS/StyleValues/BorderStyleValue.h>
#include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
#include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>
#include <LibWeb/Infra/Strings.h>

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

@ -10,6 +10,7 @@
#include <LibWeb/CSS/Clip.h>
#include <LibWeb/CSS/StyleProperties.h>
#include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
#include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
#include <LibWeb/FontCache.h>
#include <LibWeb/Layout/BlockContainer.h>
#include <LibWeb/Layout/Node.h>

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

@ -19,6 +19,7 @@
#include <LibWeb/CSS/StyleValues/BorderRadiusStyleValue.h>
#include <LibWeb/CSS/StyleValues/BorderStyleValue.h>
#include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
#include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/BrowsingContext.h>
#include <LibWeb/Loader/LoadRequest.h>
@ -1021,13 +1022,6 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartW
return value->resolve(layout_node, percentage_basis);
}
ErrorOr<String> ContentStyleValue::to_string() const
{
if (has_alt_text())
return String::formatted("{} / {}", TRY(m_properties.content->to_string()), TRY(m_properties.alt_text->to_string()));
return m_properties.content->to_string();
}
float Filter::Blur::resolved_radius(Layout::Node const& node) const
{
// Default value when omitted is 0px.

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

@ -713,35 +713,6 @@ private:
NonnullOwnPtr<CalcSum> m_expression;
};
class ContentStyleValue final : public StyleValueWithDefaultOperators<ContentStyleValue> {
public:
static ValueComparingNonnullRefPtr<ContentStyleValue> create(ValueComparingNonnullRefPtr<StyleValueList> content, ValueComparingRefPtr<StyleValueList> alt_text)
{
return adopt_ref(*new ContentStyleValue(move(content), move(alt_text)));
}
StyleValueList const& content() const { return *m_properties.content; }
bool has_alt_text() const { return !m_properties.alt_text.is_null(); }
StyleValueList const* alt_text() const { return m_properties.alt_text; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(ContentStyleValue const& other) const { return m_properties == other.m_properties; };
private:
ContentStyleValue(ValueComparingNonnullRefPtr<StyleValueList> content, ValueComparingRefPtr<StyleValueList> alt_text)
: StyleValueWithDefaultOperators(Type::Content)
, m_properties { .content = move(content), .alt_text = move(alt_text) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValueList> content;
ValueComparingRefPtr<StyleValueList> alt_text;
bool operator==(Properties const&) const = default;
} m_properties;
};
class FilterValueListStyleValue final : public StyleValueWithDefaultOperators<FilterValueListStyleValue> {
public:
static ValueComparingNonnullRefPtr<FilterValueListStyleValue> create(

23
Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.cpp Normal file
View file

@ -0,0 +1,23 @@
/*
* 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 "ContentStyleValue.h"
namespace Web::CSS {
ErrorOr<String> ContentStyleValue::to_string() const
{
if (has_alt_text())
return String::formatted("{} / {}", TRY(m_properties.content->to_string()), TRY(m_properties.alt_text->to_string()));
return m_properties.content->to_string();
}
bool ContentStyleValue::Properties::operator==(ContentStyleValue::Properties const&) const = default;
}

46
Userland/Libraries/LibWeb/CSS/StyleValues/ContentStyleValue.h Normal file
View file

@ -0,0 +1,46 @@
/*
* 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 ContentStyleValue final : public StyleValueWithDefaultOperators<ContentStyleValue> {
public:
static ValueComparingNonnullRefPtr<ContentStyleValue> create(ValueComparingNonnullRefPtr<StyleValueList> content, ValueComparingRefPtr<StyleValueList> alt_text)
{
return adopt_ref(*new ContentStyleValue(move(content), move(alt_text)));
}
virtual ~ContentStyleValue() override = default;
StyleValueList const& content() const { return *m_properties.content; }
bool has_alt_text() const { return !m_properties.alt_text.is_null(); }
StyleValueList const* alt_text() const { return m_properties.alt_text; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(ContentStyleValue const& other) const { return m_properties == other.m_properties; };
private:
ContentStyleValue(ValueComparingNonnullRefPtr<StyleValueList> content, ValueComparingRefPtr<StyleValueList> alt_text)
: StyleValueWithDefaultOperators(Type::Content)
, m_properties { .content = move(content), .alt_text = move(alt_text) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValueList> content;
ValueComparingRefPtr<StyleValueList> alt_text;
bool operator==(Properties const&) const;
} m_properties;
};
}