RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:47:35 +00:00
Code Issues Activity Actions

LibWeb: Prevent special-case CSS property parsing fallback

Browse source 
We don't want a property like `background` to fall back to parsing as a
single value or StyleValueList if `parse_background_style_value()`
fails. We just want it to fail.
This commit is contained in:
Sam Atkins 2021-09-22 11:45:04 +01:00 • committed by Andreas Kling
parent 8924b1f532
commit e40ea819d9
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2872,15 +2872,15 @@ Result<NonnullRefPtr<StyleValue>, Parser::ParsingResult> Parser::parse_css_value
case PropertyID::Background: case PropertyID::Background:
if (auto parsed_value = parse_background_value(m_context, component_values)) if (auto parsed_value = parse_background_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::BackgroundImage: case PropertyID::BackgroundImage:
if (auto parsed_value = parse_background_image_value(m_context, component_values)) if (auto parsed_value = parse_background_image_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::BackgroundRepeat: case PropertyID::BackgroundRepeat:
if (auto parsed_value = parse_background_repeat_value(m_context, component_values)) if (auto parsed_value = parse_background_repeat_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::Border: case PropertyID::Border:
case PropertyID::BorderBottom: case PropertyID::BorderBottom:
case PropertyID::BorderLeft: case PropertyID::BorderLeft:
@ -2888,54 +2888,54 @@ Result<NonnullRefPtr<StyleValue>, Parser::ParsingResult> Parser::parse_css_value
case PropertyID::BorderTop: case PropertyID::BorderTop:
if (auto parsed_value = parse_border_value(m_context, component_values)) if (auto parsed_value = parse_border_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::BorderTopLeftRadius: case PropertyID::BorderTopLeftRadius:
case PropertyID::BorderTopRightRadius: case PropertyID::BorderTopRightRadius:
case PropertyID::BorderBottomRightRadius: case PropertyID::BorderBottomRightRadius:
case PropertyID::BorderBottomLeftRadius: case PropertyID::BorderBottomLeftRadius:
if (auto parsed_value = parse_border_radius_value(m_context, component_values)) if (auto parsed_value = parse_border_radius_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::BorderRadius: case PropertyID::BorderRadius:
if (auto parsed_value = parse_border_radius_shorthand_value(m_context, component_values)) if (auto parsed_value = parse_border_radius_shorthand_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::BoxShadow: case PropertyID::BoxShadow:
if (auto parsed_value = parse_box_shadow_value(m_context, component_values)) if (auto parsed_value = parse_box_shadow_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::Flex: case PropertyID::Flex:
if (auto parsed_value = parse_flex_value(m_context, component_values)) if (auto parsed_value = parse_flex_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::FlexFlow: case PropertyID::FlexFlow:
if (auto parsed_value = parse_flex_flow_value(m_context, component_values)) if (auto parsed_value = parse_flex_flow_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::Font: case PropertyID::Font:
if (auto parsed_value = parse_font_value(m_context, component_values)) if (auto parsed_value = parse_font_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::FontFamily: case PropertyID::FontFamily:
if (auto parsed_value = parse_font_family_value(m_context, component_values)) if (auto parsed_value = parse_font_family_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::ListStyle: case PropertyID::ListStyle:
if (auto parsed_value = parse_list_style_value(m_context, component_values)) if (auto parsed_value = parse_list_style_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::Overflow: case PropertyID::Overflow:
if (auto parsed_value = parse_overflow_value(m_context, component_values)) if (auto parsed_value = parse_overflow_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::TextDecoration: case PropertyID::TextDecoration:
if (auto parsed_value = parse_text_decoration_value(m_context, component_values)) if (auto parsed_value = parse_text_decoration_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
case PropertyID::Transform: case PropertyID::Transform:
if (auto parsed_value = parse_transform_value(m_context, component_values)) if (auto parsed_value = parse_transform_value(m_context, component_values))
return parsed_value.release_nonnull(); return parsed_value.release_nonnull();
break; return ParsingResult::SyntaxError;
default: default:
break; break;
} }