LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sam Atkins 2023-03-23 21:39:08 +00:00 committed by Linus Groh
parent 273b9b4ca1
commit e24679f870
Notes: sideshowbarker 2024-07-16 23:55:09 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/e24679f870
Pull-request: https://github.com/SerenityOS/serenity/pull/18040
7 changed files with 68 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ set(SOURCES
CSS/StyleValues/ColorStyleValue.cpp
CSS/StyleValues/ContentStyleValue.cpp
CSS/StyleValues/FilterValueListStyleValue.cpp
CSS/StyleValues/FlexFlowStyleValue.cpp
CSS/StyleValues/FlexStyleValue.cpp
CSS/Supports.cpp
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp

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

@ -39,6 +39,7 @@
#include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
#include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
#include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexFlowStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/Dump.h>

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

@ -31,6 +31,7 @@
#include <LibWeb/CSS/StyleValues/BorderStyleValue.h>
#include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
#include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexFlowStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/DOM/Element.h>

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

@ -21,6 +21,7 @@
#include <LibWeb/CSS/StyleValues/ColorStyleValue.h>
#include <LibWeb/CSS/StyleValues/ContentStyleValue.h>
#include <LibWeb/CSS/StyleValues/FilterValueListStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexFlowStyleValue.h>
#include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
#include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/BrowsingContext.h>
@ -1024,11 +1025,6 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartW
return value->resolve(layout_node, percentage_basis);
}
ErrorOr<String> FlexFlowStyleValue::to_string() const
{
return String::formatted("{} {}", TRY(m_properties.flex_direction->to_string()), TRY(m_properties.flex_wrap->to_string()));
}
ErrorOr<String> FontStyleValue::to_string() const
{
return String::formatted("{} {} {} / {} {}", TRY(m_properties.font_style->to_string()), TRY(m_properties.font_weight->to_string()), TRY(m_properties.font_size->to_string()), TRY(m_properties.line_height->to_string()), TRY(m_properties.font_families->to_string()));

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

@ -661,35 +661,6 @@ private:
NonnullOwnPtr<CalcSum> m_expression;
};
class FlexFlowStyleValue final : public StyleValueWithDefaultOperators<FlexFlowStyleValue> {
public:
static ValueComparingNonnullRefPtr<FlexFlowStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> flex_direction, ValueComparingNonnullRefPtr<StyleValue> flex_wrap)
{
return adopt_ref(*new FlexFlowStyleValue(move(flex_direction), move(flex_wrap)));
}
virtual ~FlexFlowStyleValue() override = default;
ValueComparingNonnullRefPtr<StyleValue> flex_direction() const { return m_properties.flex_direction; }
ValueComparingNonnullRefPtr<StyleValue> flex_wrap() const { return m_properties.flex_wrap; }
virtual ErrorOr<String> to_string() const override;
bool properties_equal(FlexFlowStyleValue const& other) const { return m_properties == other.m_properties; };
private:
FlexFlowStyleValue(ValueComparingNonnullRefPtr<StyleValue> flex_direction, ValueComparingNonnullRefPtr<StyleValue> flex_wrap)
: StyleValueWithDefaultOperators(Type::FlexFlow)
, m_properties { .flex_direction = move(flex_direction), .flex_wrap = move(flex_wrap) }
{
}
struct Properties {
ValueComparingNonnullRefPtr<StyleValue> flex_direction;
ValueComparingNonnullRefPtr<StyleValue> flex_wrap;
bool operator==(Properties const&) const = default;
} m_properties;
};
class FontStyleValue final : public StyleValueWithDefaultOperators<FontStyleValue> {
public:
static ValueComparingNonnullRefPtr<FontStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> font_stretch, ValueComparingNonnullRefPtr<StyleValue> font_style, ValueComparingNonnullRefPtr<StyleValue> font_weight, ValueComparingNonnullRefPtr<StyleValue> font_size, ValueComparingNonnullRefPtr<StyleValue> line_height, ValueComparingNonnullRefPtr<StyleValue> font_families)

19
Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.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 "FlexFlowStyleValue.h"
namespace Web::CSS {
ErrorOr<String> FlexFlowStyleValue::to_string() const
{
return String::formatted("{} {}", TRY(m_properties.flex_direction->to_string()), TRY(m_properties.flex_wrap->to_string()));
}
}

45
Userland/Libraries/LibWeb/CSS/StyleValues/FlexFlowStyleValue.h Normal file
View File

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