mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-22 17:29:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

LibWeb/CSS: Add LengthOrAutoOrCalculated

Browse source 
It's `LengthOrCalculated` for places that want `<length> | auto`.
This commit is contained in:
Sam Atkins 2025-08-27 17:07:21 +01:00
commit 577564a1a2
Notes: github-actions[bot] 2025-09-04 12:33:48 +00:00
3 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Libraries/LibWeb/CSS/CalculatedOr.cpp
View file

@ -9,6 +9,7 @@
#include <LibWeb/CSS/StyleValues/FlexStyleValue.h> #include <LibWeb/CSS/StyleValues/FlexStyleValue.h>
#include <LibWeb/CSS/StyleValues/FrequencyStyleValue.h> #include <LibWeb/CSS/StyleValues/FrequencyStyleValue.h>
#include <LibWeb/CSS/StyleValues/IntegerStyleValue.h> #include <LibWeb/CSS/StyleValues/IntegerStyleValue.h>
#include <LibWeb/CSS/StyleValues/KeywordStyleValue.h>
#include <LibWeb/CSS/StyleValues/LengthStyleValue.h> #include <LibWeb/CSS/StyleValues/LengthStyleValue.h>
#include <LibWeb/CSS/StyleValues/NumberStyleValue.h> #include <LibWeb/CSS/StyleValues/NumberStyleValue.h>
#include <LibWeb/CSS/StyleValues/PercentageStyleValue.h> #include <LibWeb/CSS/StyleValues/PercentageStyleValue.h>
@ -67,6 +68,30 @@ NonnullRefPtr<StyleValue const> LengthOrCalculated::create_style_value() const
return LengthStyleValue::create(value()); return LengthStyleValue::create(value());
} }
Optional<LengthOrAuto> LengthOrAutoOrCalculated::resolve_calculated(NonnullRefPtr<CalculatedStyleValue const> const& calculated, CalculationResolutionContext const& context) const
{
return calculated->resolve_length(context).map([](auto& length) { return LengthOrAuto { length }; });
}
NonnullRefPtr<StyleValue const> LengthOrAutoOrCalculated::create_style_value() const
{
auto const& length_or_auto = value();
if (length_or_auto.is_auto())
return KeywordStyleValue::create(Keyword::Auto);
return LengthStyleValue::create(length_or_auto.length());
}
bool LengthOrAutoOrCalculated::is_auto() const
{
return !is_calculated() && value().is_auto();
}
LengthOrCalculated LengthOrAutoOrCalculated::without_auto() const
{
VERIFY(!is_auto());
return value().length();
}
Optional<double> NumberOrCalculated::resolve_calculated(NonnullRefPtr<CalculatedStyleValue const> const& calculated, CalculationResolutionContext const& context) const Optional<double> NumberOrCalculated::resolve_calculated(NonnullRefPtr<CalculatedStyleValue const> const& calculated, CalculationResolutionContext const& context) const
{ {
return calculated->resolve_number_deprecated(context); return calculated->resolve_number_deprecated(context);

10
Libraries/LibWeb/CSS/CalculatedOr.h
View file

@ -154,6 +154,16 @@ public:
NonnullRefPtr<StyleValue const> create_style_value() const; NonnullRefPtr<StyleValue const> create_style_value() const;
}; };
class LengthOrAutoOrCalculated : public CalculatedOr<LengthOrAutoOrCalculated, LengthOrAuto> {
public:
using CalculatedOr::CalculatedOr;
Optional<LengthOrAuto> resolve_calculated(NonnullRefPtr<CalculatedStyleValue const> const&, CalculationResolutionContext const&) const;
NonnullRefPtr<StyleValue const> create_style_value() const;
bool is_auto() const;
LengthOrCalculated without_auto() const;
};
class NumberOrCalculated : public CalculatedOr<NumberOrCalculated, double> { class NumberOrCalculated : public CalculatedOr<NumberOrCalculated, double> {
public: public:
using CalculatedOr::CalculatedOr; using CalculatedOr::CalculatedOr;

1
Libraries/LibWeb/Forward.h
View file

@ -311,6 +311,7 @@ class KeywordStyleValue;
class Length; class Length;
class LengthBox; class LengthBox;
class LengthOrAuto; class LengthOrAuto;
class LengthOrAutoOrCalculated;
class LengthOrCalculated; class LengthOrCalculated;
class LengthPercentage; class LengthPercentage;
class LengthStyleValue; class LengthStyleValue;