1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 23:07:34 +00:00

LibWeb: Alphabetize style_value_for_property() list

This commit is contained in:
Sam Atkins 2022-07-14 17:04:03 +01:00 committed by Andreas Kling
parent 237fbe4d54
commit e60beef12e

View file

@ -124,132 +124,62 @@ static NonnullRefPtr<StyleValue> style_value_for_length_percentage(LengthPercent
RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout::NodeWithStyle const& layout_node, PropertyID property_id) const RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout::NodeWithStyle const& layout_node, PropertyID property_id) const
{ {
switch (property_id) { switch (property_id) {
case CSS::PropertyID::Float: case CSS::PropertyID::Background: {
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().float_())); auto maybe_background_color = property(CSS::PropertyID::BackgroundColor);
case CSS::PropertyID::Clear: auto maybe_background_image = property(CSS::PropertyID::BackgroundImage);
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().clear())); auto maybe_background_position = property(CSS::PropertyID::BackgroundPosition);
case CSS::PropertyID::Cursor: auto maybe_background_size = property(CSS::PropertyID::BackgroundSize);
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().cursor())); auto maybe_background_repeat = property(CSS::PropertyID::BackgroundRepeat);
case CSS::PropertyID::Display: auto maybe_background_attachment = property(CSS::PropertyID::BackgroundAttachment);
return style_value_for_display(layout_node.computed_values().display()); auto maybe_background_origin = property(CSS::PropertyID::BackgroundOrigin);
case CSS::PropertyID::ZIndex: { auto maybe_background_clip = property(CSS::PropertyID::BackgroundClip);
auto maybe_z_index = layout_node.computed_values().z_index();
if (!maybe_z_index.has_value())
return {};
return NumericStyleValue::create_integer(maybe_z_index.release_value());
}
case CSS::PropertyID::TextAlign:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_align()));
case CSS::PropertyID::TextDecorationLine: {
auto text_decoration_lines = layout_node.computed_values().text_decoration_line();
if (text_decoration_lines.is_empty())
return IdentifierStyleValue::create(ValueID::None);
NonnullRefPtrVector<StyleValue> style_values;
for (auto const& line : text_decoration_lines) {
style_values.append(IdentifierStyleValue::create(to_value_id(line)));
}
return StyleValueList::create(move(style_values), StyleValueList::Separator::Space);
}
case CSS::PropertyID::TextDecorationStyle:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_decoration_style()));
case CSS::PropertyID::TextTransform:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_transform()));
case CSS::PropertyID::Position:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().position()));
case CSS::PropertyID::WhiteSpace:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().white_space()));
case CSS::PropertyID::FlexDirection:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().flex_direction()));
case CSS::PropertyID::FlexWrap:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().flex_wrap()));
case CSS::PropertyID::FlexBasis: {
switch (layout_node.computed_values().flex_basis().type) {
case FlexBasis::Content:
return IdentifierStyleValue::create(CSS::ValueID::Content);
case FlexBasis::LengthPercentage:
return style_value_for_length_percentage(*layout_node.computed_values().flex_basis().length_percentage);
case FlexBasis::Auto:
return IdentifierStyleValue::create(CSS::ValueID::Auto);
default:
VERIFY_NOT_REACHED();
}
break;
case CSS::PropertyID::FlexGrow:
return NumericStyleValue::create_float(layout_node.computed_values().flex_grow());
case CSS::PropertyID::FlexShrink:
return NumericStyleValue::create_float(layout_node.computed_values().flex_shrink());
case CSS::PropertyID::Order:
return NumericStyleValue::create_integer(layout_node.computed_values().order());
case CSS::PropertyID::Opacity:
return NumericStyleValue::create_float(layout_node.computed_values().opacity());
case CSS::PropertyID::ImageRendering:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().image_rendering()));
case CSS::PropertyID::JustifyContent:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().justify_content()));
case CSS::PropertyID::BoxShadow: {
auto box_shadow_layers = layout_node.computed_values().box_shadow();
if (box_shadow_layers.is_empty())
return {};
auto make_box_shadow_style_value = [](ShadowData const& data) { return BackgroundStyleValue::create(
return ShadowStyleValue::create(data.color, data.offset_x, data.offset_y, data.blur_radius, data.spread_distance, data.placement); value_or_default(maybe_background_color, InitialStyleValue::the()),
}; value_or_default(maybe_background_image, IdentifierStyleValue::create(CSS::ValueID::None)),
value_or_default(maybe_background_position, PositionStyleValue::create(PositionEdge::Left, Length::make_px(0), PositionEdge::Top, Length::make_px(0))),
if (box_shadow_layers.size() == 1) value_or_default(maybe_background_size, IdentifierStyleValue::create(CSS::ValueID::Auto)),
return make_box_shadow_style_value(box_shadow_layers.first()); value_or_default(maybe_background_repeat, BackgroundRepeatStyleValue::create(CSS::Repeat::Repeat, CSS::Repeat::Repeat)),
value_or_default(maybe_background_attachment, IdentifierStyleValue::create(CSS::ValueID::Scroll)),
NonnullRefPtrVector<StyleValue> box_shadow; value_or_default(maybe_background_origin, IdentifierStyleValue::create(CSS::ValueID::PaddingBox)),
box_shadow.ensure_capacity(box_shadow_layers.size()); value_or_default(maybe_background_clip, IdentifierStyleValue::create(CSS::ValueID::BorderBox)));
for (auto const& layer : box_shadow_layers)
box_shadow.append(make_box_shadow_style_value(layer));
return StyleValueList::create(move(box_shadow), StyleValueList::Separator::Comma);
} }
case CSS::PropertyID::Width: case PropertyID::BackgroundColor:
return style_value_for_length_percentage(layout_node.computed_values().width()); return ColorStyleValue::create(layout_node.computed_values().background_color());
case CSS::PropertyID::MinWidth: case CSS::PropertyID::BorderBottom: {
return style_value_for_length_percentage(layout_node.computed_values().min_width()); auto border = layout_node.computed_values().border_bottom();
case CSS::PropertyID::MaxWidth: auto width = LengthStyleValue::create(Length::make_px(border.width));
return style_value_for_length_percentage(layout_node.computed_values().max_width()); auto style = IdentifierStyleValue::create(to_value_id(border.line_style));
case CSS::PropertyID::Height: auto color = ColorStyleValue::create(border.color);
return style_value_for_length_percentage(layout_node.computed_values().height()); return BorderStyleValue::create(width, style, color);
case CSS::PropertyID::MinHeight:
return style_value_for_length_percentage(layout_node.computed_values().min_height());
case CSS::PropertyID::MaxHeight:
return style_value_for_length_percentage(layout_node.computed_values().max_height());
case CSS::PropertyID::Margin: {
auto margin = layout_node.computed_values().margin();
auto values = NonnullRefPtrVector<StyleValue> {};
values.append(style_value_for_length_percentage(margin.top));
values.append(style_value_for_length_percentage(margin.right));
values.append(style_value_for_length_percentage(margin.bottom));
values.append(style_value_for_length_percentage(margin.left));
return StyleValueList::create(move(values), StyleValueList::Separator::Space);
} }
case CSS::PropertyID::MarginTop: case CSS::PropertyID::BorderBottomColor:
return style_value_for_length_percentage(layout_node.computed_values().margin().top); return ColorStyleValue::create(layout_node.computed_values().border_bottom().color);
case CSS::PropertyID::MarginRight: case CSS::PropertyID::BorderBottomLeftRadius: {
return style_value_for_length_percentage(layout_node.computed_values().margin().right); auto const& border_radius = layout_node.computed_values().border_bottom_left_radius();
case CSS::PropertyID::MarginBottom: return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius);
return style_value_for_length_percentage(layout_node.computed_values().margin().bottom);
case CSS::PropertyID::MarginLeft:
return style_value_for_length_percentage(layout_node.computed_values().margin().left);
case CSS::PropertyID::Padding: {
auto padding = layout_node.computed_values().padding();
auto values = NonnullRefPtrVector<StyleValue> {};
values.append(style_value_for_length_percentage(padding.top));
values.append(style_value_for_length_percentage(padding.right));
values.append(style_value_for_length_percentage(padding.bottom));
values.append(style_value_for_length_percentage(padding.left));
return StyleValueList::create(move(values), StyleValueList::Separator::Space);
} }
case CSS::PropertyID::PaddingTop: case CSS::PropertyID::BorderBottomRightRadius: {
return style_value_for_length_percentage(layout_node.computed_values().padding().top); auto const& border_radius = layout_node.computed_values().border_bottom_right_radius();
case CSS::PropertyID::PaddingRight: return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius);
return style_value_for_length_percentage(layout_node.computed_values().padding().right); }
case CSS::PropertyID::PaddingBottom: case CSS::PropertyID::BorderBottomStyle:
return style_value_for_length_percentage(layout_node.computed_values().padding().bottom); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_bottom().line_style));
case CSS::PropertyID::PaddingLeft: case CSS::PropertyID::BorderBottomWidth:
return style_value_for_length_percentage(layout_node.computed_values().padding().left); return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_bottom().width));
case CSS::PropertyID::BorderLeft: {
auto border = layout_node.computed_values().border_left();
auto width = LengthStyleValue::create(Length::make_px(border.width));
auto style = IdentifierStyleValue::create(to_value_id(border.line_style));
auto color = ColorStyleValue::create(border.color);
return BorderStyleValue::create(width, style, color);
}
case CSS::PropertyID::BorderLeftColor:
return ColorStyleValue::create(layout_node.computed_values().border_left().color);
case CSS::PropertyID::BorderLeftStyle:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_left().line_style));
case CSS::PropertyID::BorderLeftWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_left().width));
case CSS::PropertyID::BorderRadius: { case CSS::PropertyID::BorderRadius: {
auto maybe_top_left_radius = property(CSS::PropertyID::BorderTopLeftRadius); auto maybe_top_left_radius = property(CSS::PropertyID::BorderTopLeftRadius);
auto maybe_top_right_radius = property(CSS::PropertyID::BorderTopRightRadius); auto maybe_top_right_radius = property(CSS::PropertyID::BorderTopRightRadius);
@ -275,15 +205,28 @@ RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout:
return BorderRadiusShorthandStyleValue::create(top_left_radius.release_nonnull(), top_right_radius.release_nonnull(), bottom_right_radius.release_nonnull(), bottom_left_radius.release_nonnull()); return BorderRadiusShorthandStyleValue::create(top_left_radius.release_nonnull(), top_right_radius.release_nonnull(), bottom_right_radius.release_nonnull(), bottom_left_radius.release_nonnull());
} }
// FIXME: The two radius components are not yet stored, as we currently don't actually render them. case CSS::PropertyID::BorderRight: {
case CSS::PropertyID::BorderBottomLeftRadius: { auto border = layout_node.computed_values().border_right();
auto const& border_radius = layout_node.computed_values().border_bottom_left_radius(); auto width = LengthStyleValue::create(Length::make_px(border.width));
return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius); auto style = IdentifierStyleValue::create(to_value_id(border.line_style));
auto color = ColorStyleValue::create(border.color);
return BorderStyleValue::create(width, style, color);
} }
case CSS::PropertyID::BorderBottomRightRadius: { case CSS::PropertyID::BorderRightColor:
auto const& border_radius = layout_node.computed_values().border_bottom_right_radius(); return ColorStyleValue::create(layout_node.computed_values().border_right().color);
return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius); case CSS::PropertyID::BorderRightStyle:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_right().line_style));
case CSS::PropertyID::BorderRightWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_right().width));
case CSS::PropertyID::BorderTop: {
auto border = layout_node.computed_values().border_top();
auto width = LengthStyleValue::create(Length::make_px(border.width));
auto style = IdentifierStyleValue::create(to_value_id(border.line_style));
auto color = ColorStyleValue::create(border.color);
return BorderStyleValue::create(width, style, color);
} }
case CSS::PropertyID::BorderTopColor:
return ColorStyleValue::create(layout_node.computed_values().border_top().color);
case CSS::PropertyID::BorderTopLeftRadius: { case CSS::PropertyID::BorderTopLeftRadius: {
auto const& border_radius = layout_node.computed_values().border_top_left_radius(); auto const& border_radius = layout_node.computed_values().border_top_left_radius();
return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius); return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius);
@ -292,86 +235,136 @@ RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout:
auto const& border_radius = layout_node.computed_values().border_top_right_radius(); auto const& border_radius = layout_node.computed_values().border_top_right_radius();
return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius); return BorderRadiusStyleValue::create(border_radius.horizontal_radius, border_radius.vertical_radius);
} }
case CSS::PropertyID::BorderTopWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_top().width));
case CSS::PropertyID::BorderRightWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_right().width));
case CSS::PropertyID::BorderBottomWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_bottom().width));
case CSS::PropertyID::BorderLeftWidth:
return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_left().width));
case CSS::PropertyID::BorderTopColor:
return ColorStyleValue::create(layout_node.computed_values().border_top().color);
case CSS::PropertyID::BorderRightColor:
return ColorStyleValue::create(layout_node.computed_values().border_right().color);
case CSS::PropertyID::BorderBottomColor:
return ColorStyleValue::create(layout_node.computed_values().border_bottom().color);
case CSS::PropertyID::BorderLeftColor:
return ColorStyleValue::create(layout_node.computed_values().border_left().color);
case CSS::PropertyID::BorderTopStyle: case CSS::PropertyID::BorderTopStyle:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_top().line_style)); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_top().line_style));
case CSS::PropertyID::BorderRightStyle: case CSS::PropertyID::BorderTopWidth:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_right().line_style)); return LengthStyleValue::create(Length::make_px(layout_node.computed_values().border_top().width));
case CSS::PropertyID::BorderBottomStyle: case CSS::PropertyID::BoxShadow: {
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_bottom().line_style)); auto box_shadow_layers = layout_node.computed_values().box_shadow();
case CSS::PropertyID::BorderLeftStyle: if (box_shadow_layers.is_empty())
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().border_left().line_style)); return {};
case CSS::PropertyID::BorderTop: {
auto border = layout_node.computed_values().border_top(); auto make_box_shadow_style_value = [](ShadowData const& data) {
auto width = LengthStyleValue::create(Length::make_px(border.width)); return ShadowStyleValue::create(data.color, data.offset_x, data.offset_y, data.blur_radius, data.spread_distance, data.placement);
auto style = IdentifierStyleValue::create(to_value_id(border.line_style)); };
auto color = ColorStyleValue::create(border.color);
return BorderStyleValue::create(width, style, color); if (box_shadow_layers.size() == 1)
return make_box_shadow_style_value(box_shadow_layers.first());
NonnullRefPtrVector<StyleValue> box_shadow;
box_shadow.ensure_capacity(box_shadow_layers.size());
for (auto const& layer : box_shadow_layers)
box_shadow.append(make_box_shadow_style_value(layer));
return StyleValueList::create(move(box_shadow), StyleValueList::Separator::Comma);
} }
case CSS::PropertyID::BorderRight: { case CSS::PropertyID::BoxSizing:
auto border = layout_node.computed_values().border_right(); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().box_sizing()));
auto width = LengthStyleValue::create(Length::make_px(border.width)); case CSS::PropertyID::Clear:
auto style = IdentifierStyleValue::create(to_value_id(border.line_style)); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().clear()));
auto color = ColorStyleValue::create(border.color); case CSS::PropertyID::Color:
return BorderStyleValue::create(width, style, color); return ColorStyleValue::create(layout_node.computed_values().color());
} case CSS::PropertyID::Cursor:
case CSS::PropertyID::BorderBottom: { return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().cursor()));
auto border = layout_node.computed_values().border_bottom(); case CSS::PropertyID::Display:
auto width = LengthStyleValue::create(Length::make_px(border.width)); return style_value_for_display(layout_node.computed_values().display());
auto style = IdentifierStyleValue::create(to_value_id(border.line_style)); case CSS::PropertyID::FlexBasis: {
auto color = ColorStyleValue::create(border.color); switch (layout_node.computed_values().flex_basis().type) {
return BorderStyleValue::create(width, style, color); case FlexBasis::Content:
} return IdentifierStyleValue::create(CSS::ValueID::Content);
case CSS::PropertyID::BorderLeft: { case FlexBasis::LengthPercentage:
auto border = layout_node.computed_values().border_left(); return style_value_for_length_percentage(*layout_node.computed_values().flex_basis().length_percentage);
auto width = LengthStyleValue::create(Length::make_px(border.width)); case FlexBasis::Auto:
auto style = IdentifierStyleValue::create(to_value_id(border.line_style)); return IdentifierStyleValue::create(CSS::ValueID::Auto);
auto color = ColorStyleValue::create(border.color); default:
return BorderStyleValue::create(width, style, color); VERIFY_NOT_REACHED();
}
break;
case CSS::PropertyID::FlexDirection:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().flex_direction()));
case CSS::PropertyID::FlexGrow:
return NumericStyleValue::create_float(layout_node.computed_values().flex_grow());
case CSS::PropertyID::FlexShrink:
return NumericStyleValue::create_float(layout_node.computed_values().flex_shrink());
case CSS::PropertyID::FlexWrap:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().flex_wrap()));
case CSS::PropertyID::Float:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().float_()));
case CSS::PropertyID::Height:
return style_value_for_length_percentage(layout_node.computed_values().height());
case CSS::PropertyID::ImageRendering:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().image_rendering()));
case CSS::PropertyID::JustifyContent:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().justify_content()));
case CSS::PropertyID::ListStyleType:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().list_style_type()));
case CSS::PropertyID::Margin: {
auto margin = layout_node.computed_values().margin();
auto values = NonnullRefPtrVector<StyleValue> {};
values.append(style_value_for_length_percentage(margin.top));
values.append(style_value_for_length_percentage(margin.right));
values.append(style_value_for_length_percentage(margin.bottom));
values.append(style_value_for_length_percentage(margin.left));
return StyleValueList::create(move(values), StyleValueList::Separator::Space);
} }
case CSS::PropertyID::MarginBottom:
return style_value_for_length_percentage(layout_node.computed_values().margin().bottom);
case CSS::PropertyID::MarginLeft:
return style_value_for_length_percentage(layout_node.computed_values().margin().left);
case CSS::PropertyID::MarginRight:
return style_value_for_length_percentage(layout_node.computed_values().margin().right);
case CSS::PropertyID::MarginTop:
return style_value_for_length_percentage(layout_node.computed_values().margin().top);
case CSS::PropertyID::MaxHeight:
return style_value_for_length_percentage(layout_node.computed_values().max_height());
case CSS::PropertyID::MaxWidth:
return style_value_for_length_percentage(layout_node.computed_values().max_width());
case CSS::PropertyID::MinHeight:
return style_value_for_length_percentage(layout_node.computed_values().min_height());
case CSS::PropertyID::MinWidth:
return style_value_for_length_percentage(layout_node.computed_values().min_width());
case CSS::PropertyID::Opacity:
return NumericStyleValue::create_float(layout_node.computed_values().opacity());
case CSS::PropertyID::Order:
return NumericStyleValue::create_integer(layout_node.computed_values().order());
case CSS::PropertyID::OverflowX: case CSS::PropertyID::OverflowX:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().overflow_x())); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().overflow_x()));
case CSS::PropertyID::OverflowY: case CSS::PropertyID::OverflowY:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().overflow_y())); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().overflow_y()));
case CSS::PropertyID::Color: case CSS::PropertyID::Padding: {
return ColorStyleValue::create(layout_node.computed_values().color()); auto padding = layout_node.computed_values().padding();
case PropertyID::BackgroundColor: auto values = NonnullRefPtrVector<StyleValue> {};
return ColorStyleValue::create(layout_node.computed_values().background_color()); values.append(style_value_for_length_percentage(padding.top));
case CSS::PropertyID::Background: { values.append(style_value_for_length_percentage(padding.right));
auto maybe_background_color = property(CSS::PropertyID::BackgroundColor); values.append(style_value_for_length_percentage(padding.bottom));
auto maybe_background_image = property(CSS::PropertyID::BackgroundImage); values.append(style_value_for_length_percentage(padding.left));
auto maybe_background_position = property(CSS::PropertyID::BackgroundPosition); return StyleValueList::create(move(values), StyleValueList::Separator::Space);
auto maybe_background_size = property(CSS::PropertyID::BackgroundSize);
auto maybe_background_repeat = property(CSS::PropertyID::BackgroundRepeat);
auto maybe_background_attachment = property(CSS::PropertyID::BackgroundAttachment);
auto maybe_background_origin = property(CSS::PropertyID::BackgroundOrigin);
auto maybe_background_clip = property(CSS::PropertyID::BackgroundClip);
return BackgroundStyleValue::create(
value_or_default(maybe_background_color, InitialStyleValue::the()),
value_or_default(maybe_background_image, IdentifierStyleValue::create(CSS::ValueID::None)),
value_or_default(maybe_background_position, PositionStyleValue::create(PositionEdge::Left, Length::make_px(0), PositionEdge::Top, Length::make_px(0))),
value_or_default(maybe_background_size, IdentifierStyleValue::create(CSS::ValueID::Auto)),
value_or_default(maybe_background_repeat, BackgroundRepeatStyleValue::create(CSS::Repeat::Repeat, CSS::Repeat::Repeat)),
value_or_default(maybe_background_attachment, IdentifierStyleValue::create(CSS::ValueID::Scroll)),
value_or_default(maybe_background_origin, IdentifierStyleValue::create(CSS::ValueID::PaddingBox)),
value_or_default(maybe_background_clip, IdentifierStyleValue::create(CSS::ValueID::BorderBox)));
} }
case CSS::PropertyID::PaddingBottom:
case CSS::PropertyID::PaddingLeft:
return style_value_for_length_percentage(layout_node.computed_values().padding().left);
return style_value_for_length_percentage(layout_node.computed_values().padding().bottom);
case CSS::PropertyID::PaddingRight:
return style_value_for_length_percentage(layout_node.computed_values().padding().right);
case CSS::PropertyID::PaddingTop:
return style_value_for_length_percentage(layout_node.computed_values().padding().top);
case CSS::PropertyID::Position:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().position()));
case CSS::PropertyID::TextAlign:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_align()));
case CSS::PropertyID::TextDecorationLine: {
auto text_decoration_lines = layout_node.computed_values().text_decoration_line();
if (text_decoration_lines.is_empty())
return IdentifierStyleValue::create(ValueID::None);
NonnullRefPtrVector<StyleValue> style_values;
for (auto const& line : text_decoration_lines) {
style_values.append(IdentifierStyleValue::create(to_value_id(line)));
}
return StyleValueList::create(move(style_values), StyleValueList::Separator::Space);
}
case CSS::PropertyID::TextDecorationStyle:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_decoration_style()));
case CSS::PropertyID::TextTransform:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().text_transform()));
case CSS::PropertyID::VerticalAlign: case CSS::PropertyID::VerticalAlign:
if (auto const* length_percentage = layout_node.computed_values().vertical_align().get_pointer<CSS::LengthPercentage>()) { if (auto const* length_percentage = layout_node.computed_values().vertical_align().get_pointer<CSS::LengthPercentage>()) {
if (length_percentage->is_length()) if (length_percentage->is_length())
@ -381,10 +374,16 @@ RefPtr<StyleValue> ResolvedCSSStyleDeclaration::style_value_for_property(Layout:
VERIFY_NOT_REACHED(); VERIFY_NOT_REACHED();
} }
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().vertical_align().get<CSS::VerticalAlign>())); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().vertical_align().get<CSS::VerticalAlign>()));
case CSS::PropertyID::ListStyleType: case CSS::PropertyID::WhiteSpace:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().list_style_type())); return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().white_space()));
case CSS::PropertyID::BoxSizing: case CSS::PropertyID::Width:
return IdentifierStyleValue::create(to_value_id(layout_node.computed_values().box_sizing())); return style_value_for_length_percentage(layout_node.computed_values().width());
case CSS::PropertyID::ZIndex: {
auto maybe_z_index = layout_node.computed_values().z_index();
if (!maybe_z_index.has_value())
return {};
return NumericStyleValue::create_integer(maybe_z_index.release_value());
}
case CSS::PropertyID::Invalid: case CSS::PropertyID::Invalid:
return IdentifierStyleValue::create(CSS::ValueID::Invalid); return IdentifierStyleValue::create(CSS::ValueID::Invalid);
case CSS::PropertyID::Custom: case CSS::PropertyID::Custom: