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: Use property_accepts_value() when parsing borders

Browse source
This commit is contained in:
Sam Atkins 2021-09-23 11:54:32 +01:00 committed by Andreas Kling
parent 5213760e4b
commit 37e69fb286
Notes: sideshowbarker 2024-07-18 03:32:26 +09:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/SerenityOS/serenity/commit/37e69fb286a
Pull-request: https://github.com/SerenityOS/serenity/pull/10188
1 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1876,37 +1876,6 @@ RefPtr<StyleValue> Parser::parse_background_repeat_value(ParsingContext const& c
RefPtr<StyleValue> Parser::parse_border_value(ParsingContext const& context, Vector<StyleComponentValueRule> const& component_values)
{
auto is_line_style = [](StyleValue const& value) -> bool {
switch (value.to_identifier()) {
case ValueID::Dotted:
case ValueID::Dashed:
case ValueID::Solid:
case ValueID::Double:
case ValueID::Groove:
case ValueID::Ridge:
case ValueID::None:
case ValueID::Hidden:
case ValueID::Inset:
case ValueID::Outset:
return true;
default:
return false;
}
};
auto is_line_width = [](StyleValue const& value) -> bool {
if (value.is_length())
return true;
// FIXME: Implement thin/medium/thick
switch (value.to_identifier()) {
case ValueID::None:
return true;
default:
return false;
}
};
if (component_values.size() > 3)
return nullptr;
@ -1919,19 +1888,19 @@ RefPtr<StyleValue> Parser::parse_border_value(ParsingContext const& context, Vec
if (!value)
return nullptr;
if (is_line_width(*value)) {
if (property_accepts_value(PropertyID::BorderWidth, *value)) {
if (border_width)
return nullptr;
border_width = value.release_nonnull();
continue;
}
if (value->is_color()) {
if (property_accepts_value(PropertyID::BorderColor, *value)) {
if (border_color)
return nullptr;
border_color = value.release_nonnull();
continue;
}
if (is_line_style(*value)) {
if (property_accepts_value(PropertyID::BorderStyle, *value)) {
if (border_style)
return nullptr;
border_style = value.release_nonnull();