RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 19:22:45 +00:00
Code Issues Activity Actions

LibWeb: Add parsing for NumericStyleValue

Browse source 
This StyleValue can hold an arbitrary float value.
This commit is contained in:
Tobias Christiansen 2021-06-03 21:59:41 +02:00 • committed by Ali Mohammad Pur
parent ae3e6510d6
commit af4d80af4d
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp
View file

@ -240,8 +240,12 @@ RefPtr<CSS::StyleValue> parse_css_value(const CSS::ParsingContext& context, cons
} }
auto length = parse_length(context, string, is_bad_length); auto length = parse_length(context, string, is_bad_length);
if (is_bad_length) if (is_bad_length) {
auto float_number = try_parse_float(string);
if (float_number.has_value())
return CSS::NumericStyleValue::create(float_number.value());
return nullptr; return nullptr;
}
if (!length.is_undefined()) if (!length.is_undefined())
return CSS::LengthStyleValue::create(length); return CSS::LengthStyleValue::create(length);

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

@ -207,6 +207,7 @@ public:
Image, Image,
Position, Position,
CustomProperty, CustomProperty,
Numeric,
}; };
Type type() const { return m_type; } Type type() const { return m_type; }
@ -220,6 +221,7 @@ public:
bool is_length() const { return type() == Type::Length; } bool is_length() const { return type() == Type::Length; }
bool is_position() const { return type() == Type::Position; } bool is_position() const { return type() == Type::Position; }
bool is_custom_property() const { return type() == Type::CustomProperty; } bool is_custom_property() const { return type() == Type::CustomProperty; }
bool is_numeric() const { return type() == Type::Numeric; }
virtual String to_string() const = 0; virtual String to_string() const = 0;
virtual Length to_length() const { return Length::make_auto(); } virtual Length to_length() const { return Length::make_auto(); }
@ -266,6 +268,26 @@ private:
String m_custom_property_name {}; String m_custom_property_name {};
}; };
class NumericStyleValue : public StyleValue {
public:
static NonnullRefPtr<NumericStyleValue> create(float value)
{
return adopt_ref(*new NumericStyleValue(value));
}
float value() const { return m_value; }
String to_string() const override { return String::formatted("{}", m_value); }
private:
explicit NumericStyleValue(float value)
: StyleValue(Type::Numeric)
, m_value(value)
{
}
float m_value { 0 };
};
class StringStyleValue : public StyleValue { class StringStyleValue : public StyleValue {
public: public:
static NonnullRefPtr<StringStyleValue> create(const String& string) static NonnullRefPtr<StringStyleValue> create(const String& string)