RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 22:17:42 +00:00
Code Issues Activity Actions

LibWeb: SVG: draw commands can also be repeated after a comma

Browse source 
Consume comma or whitespace to make it possible to also parse commands
that use comma separation.
This commit is contained in:
Simon Danner 2020-09-07 20:50:31 +02:00 • committed by Andreas Kling
parent 6e61532e06
commit 772fcba814
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibWeb/SVG/SVGPathElement.cpp
View file

@ -150,6 +150,7 @@ void PathDataParser::parse_moveto()
void PathDataParser::parse_closepath() void PathDataParser::parse_closepath()
{ {
bool absolute = consume() == 'Z'; bool absolute = consume() == 'Z';
parse_whitespace();
m_instructions.append({ PathInstructionType::ClosePath, absolute, {} }); m_instructions.append({ PathInstructionType::ClosePath, absolute, {} });
} }
@ -182,7 +183,8 @@ void PathDataParser::parse_curveto()
while (true) { while (true) {
m_instructions.append({ PathInstructionType::Curve, absolute, parse_coordinate_pair_triplet() }); m_instructions.append({ PathInstructionType::Curve, absolute, parse_coordinate_pair_triplet() });
parse_whitespace(); if (match_comma_whitespace())
parse_comma_whitespace();
if (!match_coordinate()) if (!match_coordinate())
break; break;
} }
@ -195,7 +197,8 @@ void PathDataParser::parse_smooth_curveto()
while (true) { while (true) {
m_instructions.append({ PathInstructionType::SmoothCurve, absolute, parse_coordinate_pair_double() }); m_instructions.append({ PathInstructionType::SmoothCurve, absolute, parse_coordinate_pair_double() });
parse_whitespace(); if (match_comma_whitespace())
parse_comma_whitespace();
if (!match_coordinate()) if (!match_coordinate())
break; break;
} }
@ -208,7 +211,8 @@ void PathDataParser::parse_quadratic_bezier_curveto()
while (true) { while (true) {
m_instructions.append({ PathInstructionType::QuadraticBezierCurve, absolute, parse_coordinate_pair_double() }); m_instructions.append({ PathInstructionType::QuadraticBezierCurve, absolute, parse_coordinate_pair_double() });
parse_whitespace(); if (match_comma_whitespace())
parse_comma_whitespace();
if (!match_coordinate()) if (!match_coordinate())
break; break;
} }
@ -221,7 +225,8 @@ void PathDataParser::parse_smooth_quadratic_bezier_curveto()
while (true) { while (true) {
m_instructions.append({ PathInstructionType::SmoothQuadraticBezierCurve, absolute, parse_coordinate_pair() }); m_instructions.append({ PathInstructionType::SmoothQuadraticBezierCurve, absolute, parse_coordinate_pair() });
parse_whitespace(); if (match_comma_whitespace())
parse_comma_whitespace();
if (!match_coordinate()) if (!match_coordinate())
break; break;
} }
@ -234,7 +239,8 @@ void PathDataParser::parse_elliptical_arc()
while (true) { while (true) {
m_instructions.append({ PathInstructionType::EllipticalArc, absolute, parse_elliptical_arg_argument() }); m_instructions.append({ PathInstructionType::EllipticalArc, absolute, parse_elliptical_arg_argument() });
parse_whitespace(); if (match_comma_whitespace())
parse_comma_whitespace();
if (!match_coordinate()) if (!match_coordinate())
break; break;
} }