beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 09:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb: Add parsing support for the remaining transform functions

Browse source
This commit is contained in:
Simon Wanner 2022-03-17 16:53:19 +01:00 committed by Andreas Kling
parent ad4f35ff37
commit c4f46893f6
Notes: sideshowbarker 2024-07-17 17:11:02 +09:00 
Author: https://github.com/skyrising
Commit: https://github.com/SerenityOS/serenity/commit/c4f46893f6
Pull-request: https://github.com/SerenityOS/serenity/pull/13093
Reviewed-by: https://github.com/AtkinsSJ
4 changed files with 89 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
View file

@ -3880,8 +3880,28 @@ RefPtr<StyleValue> Parser::parse_text_decoration_value(Vector<StyleComponentValu
static Optional<CSS::TransformFunction> parse_transform_function_name(StringView name)
{
if (name == "matrix")
return CSS::TransformFunction::Matrix;
if (name == "translate")
return CSS::TransformFunction::Translate;
if (name == "translateX")
return CSS::TransformFunction::TranslateX;
if (name == "translateY")
return CSS::TransformFunction::TranslateY;
if (name == "scale")
return CSS::TransformFunction::Scale;
if (name == "scaleX")
return CSS::TransformFunction::ScaleX;
if (name == "scaleY")
return CSS::TransformFunction::ScaleY;
if (name == "rotate")
return CSS::TransformFunction::Rotate;
if (name == "skew")
return CSS::TransformFunction::Skew;
if (name == "skewX")
return CSS::TransformFunction::SkewX;
if (name == "skewY")
return CSS::TransformFunction::SkewY;
return {};
}
@ -3890,6 +3910,8 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<StyleComponentValueRule>
NonnullRefPtrVector<StyleValue> transformations;
for (auto& part : component_values) {
if (part.is(Token::Type::Whitespace))
continue;
if (part.is(Token::Type::Ident) && part.token().ident().equals_ignoring_case("none")) {
if (!transformations.is_empty())
return nullptr;
@ -3902,13 +3924,32 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<StyleComponentValueRule>
if (!maybe_function.has_value())
return nullptr;
bool expect_comma = false;
NonnullRefPtrVector<StyleValue> values;
for (auto& value : part.function().values()) {
if (value.is(Token::Type::Dimension)) {
auto maybe_length = parse_length(value);
if (!maybe_length.has_value())
if (value.is(Token::Type::Whitespace))
continue;
if (value.is(Token::Type::Comma)) {
if (!expect_comma)
return nullptr;
expect_comma = false;
continue;
} else if (expect_comma)
return nullptr;
if (value.is(Token::Type::Dimension)) {
auto dimension = parse_dimension(value);
if (!dimension.has_value())
return nullptr;
auto dimension_value = dimension.release_value();
if (dimension_value.is_length())
values.append(LengthStyleValue::create(dimension_value.length()));
else if (dimension_value.is_angle())
values.append(AngleStyleValue::create(dimension_value.angle()));
else
return nullptr;
values.append(LengthStyleValue::create(maybe_length.release_value()));
} else if (value.is(Token::Type::Number)) {
auto number = parse_numeric_value(value);
values.append(number.release_nonnull());
@ -3916,6 +3957,8 @@ RefPtr<StyleValue> Parser::parse_transform_value(Vector<StyleComponentValueRule>
dbgln_if(CSS_PARSER_DEBUG, "FIXME: Unsupported value type for transformation!");
return nullptr;
}
expect_comma = true;
}
transformations.append(TransformationStyleValue::create(maybe_function.value(), move(values)));

2
Userland/Libraries/LibWeb/CSS/StyleProperties.cpp
View file

@ -335,6 +335,8 @@ Vector<CSS::Transformation> StyleProperties::transformations() const
values.append({ transformation_value.to_length() });
} else if (transformation_value.is_numeric()) {
values.append({ transformation_value.to_number() });
} else if (transformation_value.is_angle()) {
values.append({ transformation_value.as_angle().angle().to_degrees() });
} else {
dbgln("FIXME: Unsupported value in transform!");
}

30
Userland/Libraries/LibWeb/CSS/StyleValue.cpp
View file

@ -1323,9 +1323,39 @@ String TransformationStyleValue::to_string() const
StringBuilder builder;
switch (m_transform_function) {
case TransformFunction::Matrix:
builder.append("matrix");
break;
case TransformFunction::Translate:
builder.append("translate");
break;
case TransformFunction::TranslateX:
builder.append("translateX");
break;
case TransformFunction::TranslateY:
builder.append("translateY");
break;
case TransformFunction::Scale:
builder.append("scale");
break;
case TransformFunction::ScaleX:
builder.append("scaleX");
break;
case TransformFunction::ScaleY:
builder.append("scaleY");
break;
case TransformFunction::Rotate:
builder.append("rotate");
break;
case TransformFunction::Skew:
builder.append("skew");
break;
case TransformFunction::SkewX:
builder.append("skewX");
break;
case TransformFunction::SkewY:
builder.append("skewY");
break;
default:
VERIFY_NOT_REACHED();
}

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

@ -291,7 +291,17 @@ enum class TextTransform {
};
enum class TransformFunction {
Matrix,
Translate,
TranslateX,
TranslateY,
Scale,
ScaleX,
ScaleY,
Rotate,
Skew,
SkewX,
SkewY,
};
enum class VerticalAlign {