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

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

Browse source
This commit is contained in:
Sam Atkins 2023-03-23 17:54:05 +00:00 • committed by Linus Groh
parent 52cd0b2f47
commit 9d5296889f
7 changed files with 74 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -66,6 +66,7 @@ set(SOURCES
CSS/StyleValue.cpp
CSS/StyleValues/AngleStyleValue.cpp
CSS/StyleValues/BackgroundRepeatStyleValue.cpp
CSS/StyleValues/BackgroundSizeStyleValue.cpp
CSS/StyleValues/BackgroundStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp

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

@ -31,6 +31,7 @@
#include <LibWeb/CSS/StyleValue.h>
#include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>

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

@ -13,6 +13,7 @@
#include <LibWeb/CSS/StyleValue.h>
#include <LibWeb/CSS/StyleValues/AngleStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/BrowsingContext.h>
@ -293,11 +294,6 @@ StyleValueList const& StyleValue::as_value_list() const
return static_cast<StyleValueList const&>(*this);
}
ErrorOr<String> BackgroundSizeStyleValue::to_string() const
{
return String::formatted("{} {}", TRY(m_properties.size_x.to_string()), TRY(m_properties.size_y.to_string()));
}
ErrorOr<String> BorderStyleValue::to_string() const
{
return String::formatted("{} {} {}", TRY(m_properties.border_width->to_string()), TRY(m_properties.border_style->to_string()), TRY(m_properties.border_color->to_string()));

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

@ -502,36 +502,6 @@ struct StyleValueWithDefaultOperators : public StyleValue {
}
};
// NOTE: This is not used for identifier sizes, like `cover` and `contain`.
class BackgroundSizeStyleValue final : public StyleValueWithDefaultOperators<BackgroundSizeStyleValue> {
public:
static ValueComparingNonnullRefPtr<BackgroundSizeStyleValue> create(LengthPercentage size_x, LengthPercentage size_y)
{
return adopt_ref(*new BackgroundSizeStyleValue(size_x, size_y));
}
virtual ~BackgroundSizeStyleValue() override = default;
LengthPercentage size_x() const { return m_properties.size_x; }
LengthPercentage size_y() const { return m_properties.size_y; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(BackgroundSizeStyleValue const& other) const { return m_properties == other.m_properties; }
private:
BackgroundSizeStyleValue(LengthPercentage size_x, LengthPercentage size_y)
: StyleValueWithDefaultOperators(Type::BackgroundSize)
, m_properties { .size_x = size_x, .size_y = size_y }
{
}
struct Properties {
LengthPercentage size_x;
LengthPercentage size_y;
bool operator==(Properties const&) const = default;
} m_properties;
};
class BorderStyleValue final : public StyleValueWithDefaultOperators<BorderStyleValue> {
public:
static ValueComparingNonnullRefPtr<BorderStyleValue> create(

26
Userland/Libraries/LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.cpp Normal file
View file

@ -0,0 +1,26 @@
/*
* 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 "BackgroundSizeStyleValue.h"
namespace Web::CSS {
BackgroundSizeStyleValue::BackgroundSizeStyleValue(LengthPercentage size_x, LengthPercentage size_y)
: StyleValueWithDefaultOperators(Type::BackgroundSize)
, m_properties { .size_x = size_x, .size_y = size_y }
{
}
BackgroundSizeStyleValue::~BackgroundSizeStyleValue() = default;
ErrorOr<String> BackgroundSizeStyleValue::to_string() const
{
return String::formatted("{} {}", TRY(m_properties.size_x.to_string()), TRY(m_properties.size_y.to_string()));
}
}

44
Userland/Libraries/LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.h Normal file
View file

@ -0,0 +1,44 @@
/*
* 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/Length.h>
#include <LibWeb/CSS/Percentage.h>
#include <LibWeb/CSS/StyleValue.h>
namespace Web::CSS {
// NOTE: This is not used for identifier sizes, like `cover` and `contain`.
class BackgroundSizeStyleValue final : public StyleValueWithDefaultOperators<BackgroundSizeStyleValue> {
public:
static ValueComparingNonnullRefPtr<BackgroundSizeStyleValue> create(LengthPercentage size_x, LengthPercentage size_y)
{
return adopt_ref(*new BackgroundSizeStyleValue(size_x, size_y));
}
virtual ~BackgroundSizeStyleValue() override;
LengthPercentage size_x() const { return m_properties.size_x; }
LengthPercentage size_y() const { return m_properties.size_y; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(BackgroundSizeStyleValue const& other) const { return m_properties == other.m_properties; }
private:
BackgroundSizeStyleValue(LengthPercentage size_x, LengthPercentage size_y);
struct Properties {
LengthPercentage size_x;
LengthPercentage size_y;
bool operator==(Properties const&) const = default;
} m_properties;
};
}

1
Userland/Libraries/LibWeb/Layout/Node.cpp
View file

@ -6,6 +6,7 @@
#include <AK/Demangle.h>
#include <LibWeb/CSS/StyleValues/BackgroundRepeatStyleValue.h>
#include <LibWeb/CSS/StyleValues/BackgroundSizeStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>
#include <LibWeb/HTML/BrowsingContext.h>