mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-23 17:52:26 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Don't try to expand shorthands from non-string CSS values

Browse source 
If something is already e.g a length or a color value, we don't need
to try to expand it by stringifying and looking at the parts.
This commit is contained in:
Andreas Kling 2020-06-10 19:34:49 +02:00
parent c8acd7d5bf
commit 01bb6f0249
Notes: sideshowbarker 2024-07-19 05:43:20 +09:00
1 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
Libraries/LibWeb/CSS/StyleResolver.cpp
View file

@ -288,22 +288,30 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
} }
if (property_id == CSS::PropertyID::BorderStyle) { if (property_id == CSS::PropertyID::BorderStyle) {
style.set_property(CSS::PropertyID::BorderTopStyle, value); auto parts = split_on_whitespace(value.to_string());
style.set_property(CSS::PropertyID::BorderRightStyle, value); if (value.is_string() && parts.size() == 3) {
style.set_property(CSS::PropertyID::BorderBottomStyle, value); style.set_property(CSS::PropertyID::BorderTopStyle, parse_css_value(parts[0]));
style.set_property(CSS::PropertyID::BorderLeftStyle, value); style.set_property(CSS::PropertyID::BorderRightStyle, parse_css_value(parts[1]));
style.set_property(CSS::PropertyID::BorderBottomStyle, parse_css_value(parts[2]));
style.set_property(CSS::PropertyID::BorderLeftStyle, parse_css_value(parts[1]));
} else {
style.set_property(CSS::PropertyID::BorderTopStyle, value);
style.set_property(CSS::PropertyID::BorderRightStyle, value);
style.set_property(CSS::PropertyID::BorderBottomStyle, value);
style.set_property(CSS::PropertyID::BorderLeftStyle, value);
}
return; return;
} }
if (property_id == CSS::PropertyID::BorderWidth) { if (property_id == CSS::PropertyID::BorderWidth) {
auto parts = split_on_whitespace(value.to_string()); auto parts = split_on_whitespace(value.to_string());
if (parts.size() == 2) { if (value.is_string() && parts.size() == 2) {
auto vertical_border_width = parse_css_value(parts[0]); auto vertical_border_width = parse_css_value(parts[0]);
auto horizonal_border_width = parse_css_value(parts[1]); auto horizontal_border_width = parse_css_value(parts[1]);
style.set_property(CSS::PropertyID::BorderTopWidth, vertical_border_width); style.set_property(CSS::PropertyID::BorderTopWidth, vertical_border_width);
style.set_property(CSS::PropertyID::BorderRightWidth, horizonal_border_width); style.set_property(CSS::PropertyID::BorderRightWidth, horizontal_border_width);
style.set_property(CSS::PropertyID::BorderBottomWidth, vertical_border_width); style.set_property(CSS::PropertyID::BorderBottomWidth, vertical_border_width);
style.set_property(CSS::PropertyID::BorderLeftWidth, horizonal_border_width); style.set_property(CSS::PropertyID::BorderLeftWidth, horizontal_border_width);
} else { } else {
style.set_property(CSS::PropertyID::BorderTopWidth, value); style.set_property(CSS::PropertyID::BorderTopWidth, value);
style.set_property(CSS::PropertyID::BorderRightWidth, value); style.set_property(CSS::PropertyID::BorderRightWidth, value);
@ -314,10 +322,18 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
} }
if (property_id == CSS::PropertyID::BorderColor) { if (property_id == CSS::PropertyID::BorderColor) {
style.set_property(CSS::PropertyID::BorderTopColor, value); auto parts = split_on_whitespace(value.to_string());
style.set_property(CSS::PropertyID::BorderRightColor, value); if (value.is_string() && parts.size() == 4) {
style.set_property(CSS::PropertyID::BorderBottomColor, value); style.set_property(CSS::PropertyID::BorderTopColor, parse_css_value(parts[0]));
style.set_property(CSS::PropertyID::BorderLeftColor, value); style.set_property(CSS::PropertyID::BorderRightColor, parse_css_value(parts[1]));
style.set_property(CSS::PropertyID::BorderBottomColor, parse_css_value(parts[2]));
style.set_property(CSS::PropertyID::BorderLeftColor, parse_css_value(parts[3]));
} else {
style.set_property(CSS::PropertyID::BorderTopColor, value);
style.set_property(CSS::PropertyID::BorderRightColor, value);
style.set_property(CSS::PropertyID::BorderBottomColor, value);
style.set_property(CSS::PropertyID::BorderLeftColor, value);
}
return; return;
} }
@ -354,7 +370,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
} }
if (value.is_string()) { if (value.is_string()) {
auto parts = split_on_whitespace(value.to_string()); auto parts = split_on_whitespace(value.to_string());
if (parts.size() == 2) { if (value.is_string() && parts.size() == 2) {
auto vertical = parse_css_value(parts[0]); auto vertical = parse_css_value(parts[0]);
auto horizontal = parse_css_value(parts[1]); auto horizontal = parse_css_value(parts[1]);
style.set_property(CSS::PropertyID::MarginTop, vertical); style.set_property(CSS::PropertyID::MarginTop, vertical);
@ -363,7 +379,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
style.set_property(CSS::PropertyID::MarginRight, horizontal); style.set_property(CSS::PropertyID::MarginRight, horizontal);
return; return;
} }
if (parts.size() == 3) { if (value.is_string() && parts.size() == 3) {
auto top = parse_css_value(parts[0]); auto top = parse_css_value(parts[0]);
auto horizontal = parse_css_value(parts[1]); auto horizontal = parse_css_value(parts[1]);
auto bottom = parse_css_value(parts[2]); auto bottom = parse_css_value(parts[2]);
@ -373,7 +389,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
style.set_property(CSS::PropertyID::MarginRight, horizontal); style.set_property(CSS::PropertyID::MarginRight, horizontal);
return; return;
} }
if (parts.size() == 4) { if (value.is_string() && parts.size() == 4) {
auto top = parse_css_value(parts[0]); auto top = parse_css_value(parts[0]);
auto right = parse_css_value(parts[1]); auto right = parse_css_value(parts[1]);
auto bottom = parse_css_value(parts[2]); auto bottom = parse_css_value(parts[2]);
@ -400,7 +416,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
} }
if (value.is_string()) { if (value.is_string()) {
auto parts = split_on_whitespace(value.to_string()); auto parts = split_on_whitespace(value.to_string());
if (parts.size() == 2) { if (value.is_string() && parts.size() == 2) {
auto vertical = parse_css_value(parts[0]); auto vertical = parse_css_value(parts[0]);
auto horizontal = parse_css_value(parts[1]); auto horizontal = parse_css_value(parts[1]);
style.set_property(CSS::PropertyID::PaddingTop, vertical); style.set_property(CSS::PropertyID::PaddingTop, vertical);
@ -409,7 +425,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
style.set_property(CSS::PropertyID::PaddingRight, horizontal); style.set_property(CSS::PropertyID::PaddingRight, horizontal);
return; return;
} }
if (parts.size() == 3) { if (value.is_string() && parts.size() == 3) {
auto top = parse_css_value(parts[0]); auto top = parse_css_value(parts[0]);
auto horizontal = parse_css_value(parts[1]); auto horizontal = parse_css_value(parts[1]);
auto bottom = parse_css_value(parts[2]); auto bottom = parse_css_value(parts[2]);
@ -419,7 +435,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope
style.set_property(CSS::PropertyID::PaddingRight, horizontal); style.set_property(CSS::PropertyID::PaddingRight, horizontal);
return; return;
} }
if (parts.size() == 4) { if (value.is_string() && parts.size() == 4) {
auto top = parse_css_value(parts[0]); auto top = parse_css_value(parts[0]);
auto right = parse_css_value(parts[1]); auto right = parse_css_value(parts[1]);
auto bottom = parse_css_value(parts[2]); auto bottom = parse_css_value(parts[2]);