diff options
Diffstat (limited to 'Libraries')
| -rw-r--r-- | Libraries/LibWeb/CSS/StyleResolver.cpp | 86 | ||||
| -rw-r--r-- | Libraries/LibWeb/Parser/CSSParser.cpp | 36 | ||||
| -rw-r--r-- | Libraries/LibWeb/Parser/CSSParser.h | 4 |
3 files changed, 126 insertions, 0 deletions
diff --git a/Libraries/LibWeb/CSS/StyleResolver.cpp b/Libraries/LibWeb/CSS/StyleResolver.cpp index 7b5a890fa0..c97eb083ee 100644 --- a/Libraries/LibWeb/CSS/StyleResolver.cpp +++ b/Libraries/LibWeb/CSS/StyleResolver.cpp @@ -144,8 +144,94 @@ static Vector<String> split_on_whitespace(const StringView& string) return v; } +static inline void set_property_border_width(StyleProperties& style, const StyleValue& value) +{ + ASSERT(value.is_length()); + style.set_property(CSS::PropertyID::BorderTopWidth, value); + style.set_property(CSS::PropertyID::BorderRightWidth, value); + style.set_property(CSS::PropertyID::BorderBottomWidth, value); + style.set_property(CSS::PropertyID::BorderLeftWidth, value); +} + +static inline void set_property_border_color(StyleProperties& style, const StyleValue& value) +{ + ASSERT(value.is_color()); + 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); +} + +static inline void set_property_border_style(StyleProperties& style, const StyleValue& value) +{ + ASSERT(value.is_string()); + 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); +} + static void set_property_expanding_shorthands(StyleProperties& style, CSS::PropertyID property_id, const StyleValue& value) { + if (property_id == CSS::PropertyID::Border) { + auto parts = split_on_whitespace(value.to_string()); + if (value.is_length()) { + set_property_border_width(style, value); + return; + } + if (value.is_color()) { + set_property_border_color(style, value); + return; + } + if (value.is_string()) { + auto parts = split_on_whitespace(value.to_string()); + + if (parts.size() == 1) { + if (auto value = parse_line_style(parts[0])) { + set_property_border_style(style, value.release_nonnull()); + set_property_border_color(style, ColorStyleValue::create(Gfx::Color::Black)); + set_property_border_width(style, LengthStyleValue::create(Length(3, Length::Type::Absolute))); + return; + } + } + + RefPtr<LengthStyleValue> line_width_value; + RefPtr<ColorStyleValue> color_value; + RefPtr<StringStyleValue> line_style_value; + + for (auto& part : parts) { + if (auto value = parse_line_width(part)) { + if (line_width_value) + return; + line_width_value = move(value); + continue; + } + if (auto value = parse_color(part)) { + if (color_value) + return; + color_value = move(value); + continue; + } + if (auto value = parse_line_style(part)) { + if (line_style_value) + return; + line_style_value = move(value); + continue; + } + } + + if (line_width_value) + set_property_border_width(style, line_width_value.release_nonnull()); + if (color_value) + set_property_border_color(style, color_value.release_nonnull()); + if (line_style_value) + set_property_border_style(style, line_style_value.release_nonnull()); + + return; + } + return; + } + if (property_id == CSS::PropertyID::BorderStyle) { style.set_property(CSS::PropertyID::BorderTopStyle, value); style.set_property(CSS::PropertyID::BorderRightStyle, value); diff --git a/Libraries/LibWeb/Parser/CSSParser.cpp b/Libraries/LibWeb/Parser/CSSParser.cpp index e40618f116..ff18109816 100644 --- a/Libraries/LibWeb/Parser/CSSParser.cpp +++ b/Libraries/LibWeb/Parser/CSSParser.cpp @@ -153,6 +153,42 @@ NonnullRefPtr<StyleValue> parse_css_value(const StringView& string) return StringStyleValue::create(string); } +RefPtr<StyleValue> parse_line_width(const StringView& part) +{ + NonnullRefPtr<StyleValue> value = parse_css_value(part); + if (value->is_length()) + return value; + return nullptr; +} + +RefPtr<StyleValue> parse_color(const StringView& part) +{ + NonnullRefPtr<StyleValue> value = parse_css_value(part); + if (value->is_color()) + return value; + return nullptr; +} + +RefPtr<StyleValue> parse_line_style(const StringView& part) +{ + NonnullRefPtr<StyleValue> value = parse_css_value(part); + if (value->is_string()) { + if (value->to_string() == "dotted") + return value; + if (value->to_string() == "dashed") + return value; + if (value->to_string() == "solid") + return value; + if (value->to_string() == "double") + return value; + if (value->to_string() == "groove") + return value; + if (value->to_string() == "ridge") + return value; + } + return nullptr; +} + class CSSParser { public: CSSParser(const StringView& input) diff --git a/Libraries/LibWeb/Parser/CSSParser.h b/Libraries/LibWeb/Parser/CSSParser.h index 287c2931e0..0a4555e5d9 100644 --- a/Libraries/LibWeb/Parser/CSSParser.h +++ b/Libraries/LibWeb/Parser/CSSParser.h @@ -35,4 +35,8 @@ RefPtr<StyleSheet> parse_css(const StringView&); RefPtr<StyleDeclaration> parse_css_declaration(const StringView&); NonnullRefPtr<StyleValue> parse_css_value(const StringView&); +RefPtr<StyleValue> parse_line_width(const StringView&); +RefPtr<StyleValue> parse_color(const StringView&); +RefPtr<StyleValue> parse_line_style(const StringView&); + } |