mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-20 09:49:15 +03:00
LibWeb: Split FlexStyleValue out of StyleValue.{h,cpp}
This commit is contained in:
parent
89ed8e59f9
commit
273b9b4ca1
Notes:
sideshowbarker
2024-07-17 04:01:41 +09:00
Author: https://github.com/AtkinsSJ Commit: https://github.com/SerenityOS/serenity/commit/273b9b4ca1 Pull-request: https://github.com/SerenityOS/serenity/pull/18040
@ -74,6 +74,7 @@ set(SOURCES
|
||||
CSS/StyleValues/ColorStyleValue.cpp
|
||||
CSS/StyleValues/ContentStyleValue.cpp
|
||||
CSS/StyleValues/FilterValueListStyleValue.cpp
|
||||
CSS/StyleValues/FlexStyleValue.cpp
|
||||
CSS/Supports.cpp
|
||||
CSS/SyntaxHighlighter/SyntaxHighlighter.cpp
|
||||
CSS/Time.cpp
|
||||
|
@ -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/FlexStyleValue.h>
|
||||
#include <LibWeb/DOM/Document.h>
|
||||
#include <LibWeb/Dump.h>
|
||||
#include <LibWeb/Infra/Strings.h>
|
||||
|
@ -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/FlexStyleValue.h>
|
||||
#include <LibWeb/DOM/Document.h>
|
||||
#include <LibWeb/DOM/Element.h>
|
||||
#include <LibWeb/FontCache.h>
|
||||
|
@ -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/FlexStyleValue.h>
|
||||
#include <LibWeb/DOM/Document.h>
|
||||
#include <LibWeb/HTML/BrowsingContext.h>
|
||||
#include <LibWeb/Loader/LoadRequest.h>
|
||||
@ -1023,11 +1024,6 @@ CalculatedStyleValue::CalculationResult CalculatedStyleValue::CalcNumberSumPartW
|
||||
return value->resolve(layout_node, percentage_basis);
|
||||
}
|
||||
|
||||
ErrorOr<String> FlexStyleValue::to_string() const
|
||||
{
|
||||
return String::formatted("{} {} {}", TRY(m_properties.grow->to_string()), TRY(m_properties.shrink->to_string()), TRY(m_properties.basis->to_string()));
|
||||
}
|
||||
|
||||
ErrorOr<String> FlexFlowStyleValue::to_string() const
|
||||
{
|
||||
return String::formatted("{} {}", TRY(m_properties.flex_direction->to_string()), TRY(m_properties.flex_wrap->to_string()));
|
||||
|
@ -661,43 +661,6 @@ private:
|
||||
NonnullOwnPtr<CalcSum> m_expression;
|
||||
};
|
||||
|
||||
class FlexStyleValue final : public StyleValueWithDefaultOperators<FlexStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<FlexStyleValue> create(
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow,
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink,
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis)
|
||||
{
|
||||
return adopt_ref(*new FlexStyleValue(move(grow), move(shrink), move(basis)));
|
||||
}
|
||||
virtual ~FlexStyleValue() override = default;
|
||||
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow() const { return m_properties.grow; }
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink() const { return m_properties.shrink; }
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis() const { return m_properties.basis; }
|
||||
|
||||
virtual ErrorOr<String> to_string() const override;
|
||||
|
||||
bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; };
|
||||
|
||||
private:
|
||||
FlexStyleValue(
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow,
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink,
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis)
|
||||
: StyleValueWithDefaultOperators(Type::Flex)
|
||||
, m_properties { .grow = move(grow), .shrink = move(shrink), .basis = move(basis) }
|
||||
{
|
||||
}
|
||||
|
||||
struct Properties {
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow;
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink;
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis;
|
||||
bool operator==(Properties const&) const = default;
|
||||
} m_properties;
|
||||
};
|
||||
|
||||
class FlexFlowStyleValue final : public StyleValueWithDefaultOperators<FlexFlowStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<FlexFlowStyleValue> create(ValueComparingNonnullRefPtr<StyleValue> flex_direction, ValueComparingNonnullRefPtr<StyleValue> flex_wrap)
|
||||
|
19
Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.cpp
Normal file
19
Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.cpp
Normal 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 "FlexStyleValue.h"
|
||||
|
||||
namespace Web::CSS {
|
||||
|
||||
ErrorOr<String> FlexStyleValue::to_string() const
|
||||
{
|
||||
return String::formatted("{} {} {}", TRY(m_properties.grow->to_string()), TRY(m_properties.shrink->to_string()), TRY(m_properties.basis->to_string()));
|
||||
}
|
||||
|
||||
}
|
53
Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h
Normal file
53
Userland/Libraries/LibWeb/CSS/StyleValues/FlexStyleValue.h
Normal 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 FlexStyleValue final : public StyleValueWithDefaultOperators<FlexStyleValue> {
|
||||
public:
|
||||
static ValueComparingNonnullRefPtr<FlexStyleValue> create(
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow,
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink,
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis)
|
||||
{
|
||||
return adopt_ref(*new FlexStyleValue(move(grow), move(shrink), move(basis)));
|
||||
}
|
||||
virtual ~FlexStyleValue() override = default;
|
||||
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow() const { return m_properties.grow; }
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink() const { return m_properties.shrink; }
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis() const { return m_properties.basis; }
|
||||
|
||||
virtual ErrorOr<String> to_string() const override;
|
||||
|
||||
bool properties_equal(FlexStyleValue const& other) const { return m_properties == other.m_properties; };
|
||||
|
||||
private:
|
||||
FlexStyleValue(
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow,
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink,
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis)
|
||||
: StyleValueWithDefaultOperators(Type::Flex)
|
||||
, m_properties { .grow = move(grow), .shrink = move(shrink), .basis = move(basis) }
|
||||
{
|
||||
}
|
||||
|
||||
struct Properties {
|
||||
ValueComparingNonnullRefPtr<StyleValue> grow;
|
||||
ValueComparingNonnullRefPtr<StyleValue> shrink;
|
||||
ValueComparingNonnullRefPtr<StyleValue> basis;
|
||||
bool operator==(Properties const&) const = default;
|
||||
} m_properties;
|
||||
};
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user