mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-10-03 06:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb/CSS: Rename CalculatedStyleValue -> CSSMathValue

Browse source 
This matches the name in the CSS Typed OM spec. There's quite a lot
still to do to make it match the spec behavior, but this is the first
step.
This commit is contained in:
Sam Atkins 2024-09-18 17:27:47 +01:00 • committed by Sam Atkins
commit 76daba3069
Notes: github-actions[bot] 2024-09-18 19:39:35 +00:00
32 changed files with 340 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Userland/Libraries/LibWeb/CSS/CalculatedOr.h
View file

@ -13,7 +13,7 @@
#include <LibWeb/CSS/Length.h>
#include <LibWeb/CSS/Percentage.h>
#include <LibWeb/CSS/Resolution.h>
#include <LibWeb/CSS/StyleValues/CalculatedStyleValue.h>
#include <LibWeb/CSS/StyleValues/CSSMathValue.h>
#include <LibWeb/CSS/Time.h>
namespace Web::CSS {
@ -26,14 +26,14 @@ public:
{
}
CalculatedOr(NonnullRefPtr<CalculatedStyleValue> calculated)
CalculatedOr(NonnullRefPtr<CSSMathValue> calculated)
: m_value(move(calculated))
{
}
virtual ~CalculatedOr() = default;
bool is_calculated() const { return m_value.template has<NonnullRefPtr<CalculatedStyleValue>>(); }
bool is_calculated() const { return m_value.template has<NonnullRefPtr<CSSMathValue>>(); }
T const& value() const
{
@ -48,10 +48,10 @@ public:
return create_style_value();
}
NonnullRefPtr<CalculatedStyleValue> const& calculated() const
NonnullRefPtr<CSSMathValue> const& calculated() const
{
VERIFY(is_calculated());
return m_value.template get<NonnullRefPtr<CalculatedStyleValue>>();
return m_value.template get<NonnullRefPtr<CSSMathValue>>();
}
T resolved(Layout::Node const& layout_node) const
@ -60,7 +60,7 @@ public:
[&](T const& t) {
return t;
},
[&](NonnullRefPtr<CalculatedStyleValue> const& calculated) {
[&](NonnullRefPtr<CSSMathValue> const& calculated) {
return resolve_calculated(calculated, layout_node);
});
}
@ -68,7 +68,7 @@ public:
String to_string() const
{
if (is_calculated())
return m_value.template get<NonnullRefPtr<CalculatedStyleValue>>()->to_string();
return m_value.template get<NonnullRefPtr<CSSMathValue>>()->to_string();
return m_value.template get<T>().to_string();
}
@ -81,11 +81,11 @@ public:
}
protected:
virtual T resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const = 0;
virtual T resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const = 0;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const = 0;
private:
Variant<T, NonnullRefPtr<CalculatedStyleValue>> m_value;
Variant<T, NonnullRefPtr<CSSMathValue>> m_value;
};
class AngleOrCalculated : public CalculatedOr<Angle> {
@ -93,7 +93,7 @@ public:
using CalculatedOr<Angle>::CalculatedOr;
private:
virtual Angle resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Angle resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -102,7 +102,7 @@ public:
using CalculatedOr<Flex>::CalculatedOr;
private:
virtual Flex resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Flex resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -111,7 +111,7 @@ public:
using CalculatedOr<Frequency>::CalculatedOr;
private:
virtual Frequency resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Frequency resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -120,7 +120,7 @@ public:
using CalculatedOr<i64>::CalculatedOr;
private:
virtual i64 resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual i64 resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -131,7 +131,7 @@ public:
[[nodiscard]] Length resolved(Length::ResolutionContext const&) const;
private:
virtual Length resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Length resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -140,7 +140,7 @@ public:
using CalculatedOr<double>::CalculatedOr;
private:
virtual double resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual double resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -149,7 +149,7 @@ public:
using CalculatedOr<Percentage>::CalculatedOr;
private:
virtual Percentage resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Percentage resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -158,7 +158,7 @@ public:
using CalculatedOr<Resolution>::CalculatedOr;
private:
virtual Resolution resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Resolution resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};
@ -167,7 +167,7 @@ public:
using CalculatedOr<Time>::CalculatedOr;
private:
virtual Time resolve_calculated(NonnullRefPtr<CalculatedStyleValue> const&, Layout::Node const&) const override;
virtual Time resolve_calculated(NonnullRefPtr<CSSMathValue> const&, Layout::Node const&) const override;
virtual NonnullRefPtr<CSSStyleValue> create_style_value() const override;
};