diff --git a/Userland/Libraries/LibWeb/Bindings/CSSStyleDeclarationWrapperCustom.cpp b/Userland/Libraries/LibWeb/Bindings/CSSStyleDeclarationWrapperCustom.cpp index 606dbf299e5..6a20362c081 100644 --- a/Userland/Libraries/LibWeb/Bindings/CSSStyleDeclarationWrapperCustom.cpp +++ b/Userland/Libraries/LibWeb/Bindings/CSSStyleDeclarationWrapperCustom.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include namespace Web::Bindings { @@ -48,7 +48,7 @@ bool CSSStyleDeclarationWrapper::internal_set(JS::PropertyName const& name, JS:: if (vm().exception()) return false; - auto new_value = parse_css_value(CSS::DeprecatedParsingContext {}, css_text, property_id); + auto new_value = parse_css_value(CSS::ParsingContext {}, css_text, property_id); // FIXME: What are we supposed to do if we can't parse it? if (!new_value) return false; diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index 8a1cabc134a..730ce46c727 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -19,7 +19,6 @@ set(SOURCES CSS/CSSStyleSheet.cpp CSS/DefaultStyleSheetSource.cpp CSS/Length.cpp - CSS/Parser/DeprecatedCSSParser.cpp CSS/Parser/Parser.cpp CSS/Parser/StyleRules.cpp CSS/Parser/Token.cpp diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp deleted file mode 100644 index 90e62a27f2e..00000000000 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.cpp +++ /dev/null @@ -1,1553 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * Copyright (c) 2021, Tobias Christiansen - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define PARSE_VERIFY(x) \ - if (!(x)) { \ - dbgln("CSS PARSER ASSERTION FAILED: {}", #x); \ - dbgln("At character# {} in CSS: _{}_", index, css); \ - VERIFY_NOT_REACHED(); \ - } - -static inline void log_parse_error(const SourceLocation& location = SourceLocation::current()) -{ - dbgln("CSS Parse error! {}", location); -} - -namespace Web { - -namespace CSS { - -DeprecatedParsingContext::DeprecatedParsingContext() -{ -} - -DeprecatedParsingContext::DeprecatedParsingContext(const DOM::Document& document) - : m_document(&document) -{ -} - -DeprecatedParsingContext::DeprecatedParsingContext(const DOM::ParentNode& parent_node) - : m_document(&parent_node.document()) -{ -} - -bool DeprecatedParsingContext::in_quirks_mode() const -{ - return m_document ? m_document->in_quirks_mode() : false; -} - -URL DeprecatedParsingContext::complete_url(const String& addr) const -{ - return m_document ? m_document->url().complete_url(addr) : URL::create_with_url_or_path(addr); -} - -} - -static Optional parse_css_color(const CSS::DeprecatedParsingContext&, const StringView& view) -{ - if (view.equals_ignoring_case("transparent")) - return Color::from_rgba(0x00000000); - - auto color = Color::from_string(view.to_string().to_lowercase()); - if (color.has_value()) - return color; - - return {}; -} - -static Optional try_parse_float(const StringView& string) -{ - const char* str = string.characters_without_null_termination(); - size_t len = string.length(); - size_t weight = 1; - int exp_val = 0; - float value = 0.0f; - float fraction = 0.0f; - bool has_sign = false; - bool is_negative = false; - bool is_fractional = false; - bool is_scientific = false; - - if (str[0] == '-') { - is_negative = true; - has_sign = true; - } - if (str[0] == '+') { - has_sign = true; - } - - for (size_t i = has_sign; i < len; i++) { - - // Looks like we're about to start working on the fractional part - if (str[i] == '.') { - is_fractional = true; - continue; - } - - if (str[i] == 'e' || str[i] == 'E') { - if (str[i + 1] == '-' || str[i + 1] == '+') - exp_val = atoi(str + i + 2); - else - exp_val = atoi(str + i + 1); - - is_scientific = true; - continue; - } - - if (str[i] < '0' || str[i] > '9' || exp_val != 0) { - return {}; - continue; - } - - if (is_fractional) { - fraction *= 10; - fraction += str[i] - '0'; - weight *= 10; - } else { - value = value * 10; - value += str[i] - '0'; - } - } - - fraction /= weight; - value += fraction; - - if (is_scientific) { - bool divide = exp_val < 0; - if (divide) - exp_val *= -1; - - for (int i = 0; i < exp_val; i++) { - if (divide) - value /= 10; - else - value *= 10; - } - } - - return is_negative ? -value : value; -} - -static CSS::Length::Type length_type_from_unit(const StringView& view) -{ - if (view.ends_with('%')) - return CSS::Length::Type::Percentage; - if (view.ends_with("px", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Px; - if (view.ends_with("pt", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Pt; - if (view.ends_with("pc", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Pc; - if (view.ends_with("mm", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Mm; - if (view.ends_with("rem", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Rem; - if (view.ends_with("em", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Em; - if (view.ends_with("ex", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Ex; - if (view.ends_with("vw", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Vw; - if (view.ends_with("vh", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Vh; - if (view.ends_with("vmax", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Vmax; - if (view.ends_with("vmin", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Vmin; - if (view.ends_with("cm", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Cm; - if (view.ends_with("in", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::In; - if (view.ends_with("Q", CaseSensitivity::CaseInsensitive)) - return CSS::Length::Type::Q; - if (view == "0") - return CSS::Length::Type::Px; - - return CSS::Length::Type::Undefined; -} - -static CSS::Length parse_length(const CSS::DeprecatedParsingContext& context, const StringView& view, bool& is_bad_length) -{ - CSS::Length::Type type = length_type_from_unit(view); - Optional value; - - switch (type) { - case CSS::Length::Type::Percentage: - value = try_parse_float(view.substring_view(0, view.length() - 1)); - break; - case CSS::Length::Type::Px: - if (view == "0") - value = 0; - else - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Pt: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Pc: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Mm: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Rem: - value = try_parse_float(view.substring_view(0, view.length() - 3)); - break; - case CSS::Length::Type::Em: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Ex: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Vw: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Vh: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Vmax: - value = try_parse_float(view.substring_view(0, view.length() - 4)); - break; - case CSS::Length::Type::Vmin: - value = try_parse_float(view.substring_view(0, view.length() - 4)); - break; - case CSS::Length::Type::Cm: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::In: - value = try_parse_float(view.substring_view(0, view.length() - 2)); - break; - case CSS::Length::Type::Q: - value = try_parse_float(view.substring_view(0, view.length() - 1)); - break; - default: - if (context.in_quirks_mode()) { - type = CSS::Length::Type::Px; - value = try_parse_float(view); - } else { - value = try_parse_float(view); - if (value.has_value()) - is_bad_length = true; - } - } - - if (!value.has_value()) - return {}; - - return CSS::Length(value.value(), type); -} - -static bool takes_integer_value(CSS::PropertyID property_id) -{ - return property_id == CSS::PropertyID::ZIndex || property_id == CSS::PropertyID::FontWeight || property_id == CSS::PropertyID::Custom; -} - -static StringView parse_custom_property_name(const StringView& value) -{ - if (!value.starts_with("var(") || !value.ends_with(")")) - return {}; - // FIXME: Allow for fallback - auto first_comma_index = value.find(','); - auto length = value.length(); - - auto substring_length = first_comma_index.has_value() ? first_comma_index.value() - 4 - 1 : length - 4 - 1; - return value.substring_view(4, substring_length); -} - -static StringView isolate_calc_expression(const StringView& value) -{ - if (!value.starts_with("calc(") || !value.ends_with(")")) - return {}; - auto substring_length = value.length() - 5 - 1; - return value.substring_view(5, substring_length); -} - -struct CalcToken { - enum class Type { - Undefined, - Number, - Unit, - Whitespace, - Plus, - Minus, - Asterisk, - Slash, - OpenBracket, - CloseBracket, - } type { Type::Undefined }; - String value {}; -}; - -static void eat_white_space(Vector&); -static Optional parse_calc_value(Vector&); -static OwnPtr parse_calc_product_part_with_operator(Vector&); -static Optional parse_calc_number_value(Vector&); -static OwnPtr parse_calc_product(Vector&); -static OwnPtr parse_calc_sum_part_with_operator(Vector&); -static OwnPtr parse_calc_sum(Vector&); -static OwnPtr parse_calc_number_sum(Vector& tokens); -static OwnPtr parse_calc_number_product_part_with_operator(Vector& tokens); -static OwnPtr parse_calc_number_product(Vector& tokens); -static OwnPtr parse_calc_number_sum_part_with_operator(Vector& tokens); - -static OwnPtr parse_calc_expression(const StringView& expression_string) -{ - // First, tokenize - - Vector tokens; - - GenericLexer lexer(expression_string); - while (!lexer.is_eof()) { - // Number - if (((lexer.next_is('+') || lexer.next_is('-')) && !isspace(lexer.peek(1))) - || lexer.next_is('.') - || lexer.next_is(isdigit)) { - - auto number = lexer.consume_while(is_any_of("+-.0123456789")); - tokens.append(CalcToken { CalcToken::Type ::Number, number.to_string() }); - continue; - } - - auto ch = lexer.consume(); - - if (isspace(ch)) { - tokens.append(CalcToken { CalcToken::Type::Whitespace }); - continue; - } - - if (ch == '%') { - tokens.append(CalcToken { CalcToken::Type::Unit, "%" }); - continue; - } - - if (ch == '+') { - tokens.append(CalcToken { CalcToken::Type::Plus }); - continue; - } - - if (ch == '-') { - tokens.append(CalcToken { CalcToken::Type::Minus }); - continue; - } - - if (ch == '*') { - tokens.append(CalcToken { CalcToken::Type::Asterisk }); - continue; - } - - if (ch == '/') { - tokens.append(CalcToken { CalcToken::Type::Slash }); - continue; - } - - if (ch == '(') { - tokens.append(CalcToken { CalcToken::Type::OpenBracket }); - continue; - } - - if (ch == ')') { - tokens.append(CalcToken { CalcToken::Type::CloseBracket }); - continue; - } - - // Unit - if (isalpha(ch)) { - lexer.retreat(); - auto unit = lexer.consume_while(isalpha); - tokens.append(CalcToken { CalcToken::Type::Unit, unit.to_string() }); - continue; - } - - VERIFY_NOT_REACHED(); - } - - // Then, parse - - return parse_calc_sum(tokens); -} - -static void eat_white_space(Vector& tokens) -{ - while (tokens.size() > 0 && tokens.first().type == CalcToken::Type::Whitespace) - tokens.take_first(); -} - -static Optional parse_calc_value(Vector& tokens) -{ - auto current_token = tokens.take_first(); - - if (current_token.type == CalcToken::Type::OpenBracket) { - auto parsed_calc_sum = parse_calc_sum(tokens); - if (!parsed_calc_sum) - return {}; - return (CSS::CalculatedStyleValue::CalcValue) { parsed_calc_sum.release_nonnull() }; - } - - if (current_token.type != CalcToken::Type::Number) - return {}; - - auto try_the_number = try_parse_float(current_token.value); - if (!try_the_number.has_value()) - return {}; - - float the_number = try_the_number.value(); - - if (tokens.first().type != CalcToken::Type::Unit) - return (CSS::CalculatedStyleValue::CalcValue) { the_number }; - - auto type = length_type_from_unit(tokens.take_first().value); - - if (type == CSS::Length::Type::Undefined) - return {}; - - return (CSS::CalculatedStyleValue::CalcValue) { CSS::Length(the_number, type) }; -} - -static OwnPtr parse_calc_product_part_with_operator(Vector& tokens) -{ - auto product_with_operator = make(); - - eat_white_space(tokens); - - auto op = tokens.first(); - if (op.type == CalcToken::Type::Asterisk) { - tokens.take_first(); - eat_white_space(tokens); - product_with_operator->op = CSS::CalculatedStyleValue::CalcProductPartWithOperator::Multiply; - auto parsed_calc_value = parse_calc_value(tokens); - if (!parsed_calc_value.has_value()) - return nullptr; - product_with_operator->value = { parsed_calc_value.release_value() }; - - } else if (op.type == CalcToken::Type::Slash) { - tokens.take_first(); - eat_white_space(tokens); - product_with_operator->op = CSS::CalculatedStyleValue::CalcProductPartWithOperator::Divide; - auto parsed_calc_number_value = parse_calc_number_value(tokens); - if (!parsed_calc_number_value.has_value()) - return nullptr; - product_with_operator->value = { parsed_calc_number_value.release_value() }; - } else { - return nullptr; - } - - return product_with_operator; -} - -static OwnPtr parse_calc_number_product_part_with_operator(Vector& tokens) -{ - auto number_product_with_operator = make(); - - eat_white_space(tokens); - - auto op = tokens.first(); - if (op.type == CalcToken::Type::Asterisk) { - tokens.take_first(); - eat_white_space(tokens); - number_product_with_operator->op = CSS::CalculatedStyleValue::CalcNumberProductPartWithOperator::Multiply; - } else if (op.type == CalcToken::Type::Slash) { - tokens.take_first(); - eat_white_space(tokens); - number_product_with_operator->op = CSS::CalculatedStyleValue::CalcNumberProductPartWithOperator::Divide; - } else { - return nullptr; - } - auto parsed_calc_value = parse_calc_number_value(tokens); - if (!parsed_calc_value.has_value()) - return nullptr; - number_product_with_operator->value = parsed_calc_value.release_value(); - - return number_product_with_operator; -} - -static OwnPtr parse_calc_number_product(Vector& tokens) -{ - auto calc_number_product = make(); - - auto first_calc_number_value_or_error = parse_calc_number_value(tokens); - if (!first_calc_number_value_or_error.has_value()) - return nullptr; - calc_number_product->first_calc_number_value = first_calc_number_value_or_error.release_value(); - - while (tokens.size() > 0) { - auto number_product_with_operator = parse_calc_number_product_part_with_operator(tokens); - if (!number_product_with_operator) - break; - calc_number_product->zero_or_more_additional_calc_number_values.append(number_product_with_operator.release_nonnull()); - } - - return calc_number_product; -} - -static OwnPtr parse_calc_number_sum_part_with_operator(Vector& tokens) -{ - if (tokens.size() < 3) - return nullptr; - if (!((tokens[0].type == CalcToken::Type::Plus - || tokens[0].type == CalcToken::Type::Minus) - && tokens[1].type == CalcToken::Type::Whitespace)) - return nullptr; - - auto op_token = tokens.take_first().type; - tokens.take_first(); // Whitespace; - - CSS::CalculatedStyleValue::CalcNumberSumPartWithOperator::Operation op; - if (op_token == CalcToken::Type::Plus) - op = CSS::CalculatedStyleValue::CalcNumberSumPartWithOperator::Operation::Add; - else if (op_token == CalcToken::Type::Minus) - op = CSS::CalculatedStyleValue::CalcNumberSumPartWithOperator::Operation::Subtract; - else - return nullptr; - - auto calc_number_product = parse_calc_number_product(tokens); - if (!calc_number_product) - return nullptr; - return make(op, calc_number_product.release_nonnull()); -} - -static OwnPtr parse_calc_number_sum(Vector& tokens) -{ - if (tokens.take_first().type != CalcToken::Type::OpenBracket) - return nullptr; - - auto first_calc_number_product_or_error = parse_calc_number_product(tokens); - if (!first_calc_number_product_or_error) - return nullptr; - - NonnullOwnPtrVector additional {}; - while (tokens.size() > 0 && tokens.first().type != CalcToken::Type::CloseBracket) { - auto calc_sum_part = parse_calc_number_sum_part_with_operator(tokens); - if (!calc_sum_part) - return nullptr; - additional.append(calc_sum_part.release_nonnull()); - } - - eat_white_space(tokens); - - auto calc_number_sum = make(first_calc_number_product_or_error.release_nonnull(), move(additional)); - return calc_number_sum; -} - -static Optional parse_calc_number_value(Vector& tokens) -{ - if (tokens.first().type == CalcToken::Type::OpenBracket) { - auto calc_number_sum = parse_calc_number_sum(tokens); - if (calc_number_sum) - return { calc_number_sum.release_nonnull() }; - } - - if (tokens.first().type != CalcToken::Type::Number) - return {}; - - auto the_number_string = tokens.take_first().value; - auto try_the_number = try_parse_float(the_number_string); - if (!try_the_number.has_value()) - return {}; - return try_the_number.value(); -} - -static OwnPtr parse_calc_product(Vector& tokens) -{ - auto calc_product = make(); - - auto first_calc_value_or_error = parse_calc_value(tokens); - if (!first_calc_value_or_error.has_value()) - return nullptr; - calc_product->first_calc_value = first_calc_value_or_error.release_value(); - - while (tokens.size() > 0) { - auto product_with_operator = parse_calc_product_part_with_operator(tokens); - if (!product_with_operator) - break; - calc_product->zero_or_more_additional_calc_values.append(product_with_operator.release_nonnull()); - } - - return calc_product; -} - -static OwnPtr parse_calc_sum_part_with_operator(Vector& tokens) -{ - // The following has to have the shape of <+ or -> - // But the first whitespace gets eaten in parse_calc_product_part_with_operator(). - if (tokens.size() < 3) - return {}; - if (!((tokens[0].type == CalcToken::Type::Plus - || tokens[0].type == CalcToken::Type::Minus) - && tokens[1].type == CalcToken::Type::Whitespace)) - return nullptr; - - auto op_token = tokens.take_first().type; - tokens.take_first(); // Whitespace; - - CSS::CalculatedStyleValue::CalcSumPartWithOperator::Operation op; - if (op_token == CalcToken::Type::Plus) - op = CSS::CalculatedStyleValue::CalcSumPartWithOperator::Operation::Add; - else if (op_token == CalcToken::Type::Minus) - op = CSS::CalculatedStyleValue::CalcSumPartWithOperator::Operation::Subtract; - else - return nullptr; - - auto calc_product = parse_calc_product(tokens); - if (!calc_product) - return nullptr; - return make(op, calc_product.release_nonnull()); -}; - -static OwnPtr parse_calc_sum(Vector& tokens) -{ - auto parsed_calc_product = parse_calc_product(tokens); - if (!parsed_calc_product) - return nullptr; - - NonnullOwnPtrVector additional {}; - while (tokens.size() > 0 && tokens.first().type != CalcToken::Type::CloseBracket) { - auto calc_sum_part = parse_calc_sum_part_with_operator(tokens); - if (!calc_sum_part) - return nullptr; - additional.append(calc_sum_part.release_nonnull()); - } - - eat_white_space(tokens); - - return make(parsed_calc_product.release_nonnull(), move(additional)); -} - -static RefPtr parse_box_shadow(CSS::DeprecatedParsingContext const& context, StringView const& string) -{ - // FIXME: Also support inset, spread-radius and multiple comma-seperated box-shadows - CSS::Length offset_x {}; - CSS::Length offset_y {}; - CSS::Length blur_radius {}; - Color color {}; - - auto parts = string.split_view(' '); - - if (parts.size() < 3 || parts.size() > 4) - return nullptr; - - bool bad_length = false; - offset_x = parse_length(context, parts[0], bad_length); - if (bad_length) - return nullptr; - - bad_length = false; - offset_y = parse_length(context, parts[1], bad_length); - if (bad_length) - return nullptr; - - if (parts.size() == 3) { - auto parsed_color = parse_color(context, parts[2]); - if (!parsed_color) - return nullptr; - color = parsed_color->color(); - } else if (parts.size() == 4) { - bad_length = false; - blur_radius = parse_length(context, parts[2], bad_length); - if (bad_length) - return nullptr; - - auto parsed_color = parse_color(context, parts[3]); - if (!parsed_color) - return nullptr; - color = parsed_color->color(); - } - return CSS::BoxShadowStyleValue::create(offset_x, offset_y, blur_radius, color); -} - -RefPtr parse_css_value(const CSS::DeprecatedParsingContext& context, const StringView& string, CSS::PropertyID property_id) -{ - bool is_bad_length = false; - - if (property_id == CSS::PropertyID::BoxShadow) { - auto parsed_box_shadow = parse_box_shadow(context, string); - if (parsed_box_shadow) - return parsed_box_shadow; - } - - if (takes_integer_value(property_id)) { - auto integer = string.to_int(); - if (integer.has_value()) - return CSS::LengthStyleValue::create(CSS::Length::make_px(integer.value())); - } - - auto length = parse_length(context, string, is_bad_length); - if (is_bad_length) { - auto float_number = try_parse_float(string); - if (float_number.has_value()) - return CSS::NumericStyleValue::create(float_number.value()); - return nullptr; - } - if (!length.is_undefined()) - return CSS::LengthStyleValue::create(length); - - if (string.equals_ignoring_case("inherit")) - return CSS::InheritStyleValue::create(); - if (string.equals_ignoring_case("initial")) - return CSS::InitialStyleValue::create(); - if (string.equals_ignoring_case("auto")) - return CSS::LengthStyleValue::create(CSS::Length::make_auto()); - if (string.starts_with("var(")) - return CSS::CustomStyleValue::create(parse_custom_property_name(string)); - if (string.starts_with("calc(")) { - auto calc_expression_string = isolate_calc_expression(string); - auto calc_expression = parse_calc_expression(calc_expression_string); - if (calc_expression) - return CSS::CalculatedStyleValue::create(calc_expression_string, calc_expression.release_nonnull()); - } - - auto value_id = CSS::value_id_from_string(string); - if (value_id != CSS::ValueID::Invalid) - return CSS::IdentifierStyleValue::create(value_id); - - auto color = parse_css_color(context, string); - if (color.has_value()) - return CSS::ColorStyleValue::create(color.value()); - - return CSS::StringStyleValue::create(string); -} - -RefPtr parse_line_width(const CSS::DeprecatedParsingContext& context, const StringView& part) -{ - auto value = parse_css_value(context, part); - if (value && value->is_length()) - return static_ptr_cast(value); - return nullptr; -} - -RefPtr parse_color(const CSS::DeprecatedParsingContext& context, const StringView& part) -{ - auto value = parse_css_value(context, part); - if (value && value->is_color()) - return static_ptr_cast(value); - return nullptr; -} - -RefPtr parse_line_style(const CSS::DeprecatedParsingContext& context, const StringView& part) -{ - auto parsed_value = parse_css_value(context, part); - if (!parsed_value || parsed_value->type() != CSS::StyleValue::Type::Identifier) - return nullptr; - auto value = static_ptr_cast(parsed_value); - if (value->id() == CSS::ValueID::Dotted) - return value; - if (value->id() == CSS::ValueID::Dashed) - return value; - if (value->id() == CSS::ValueID::Solid) - return value; - if (value->id() == CSS::ValueID::Double) - return value; - if (value->id() == CSS::ValueID::Groove) - return value; - if (value->id() == CSS::ValueID::Ridge) - return value; - if (value->id() == CSS::ValueID::None) - return value; - if (value->id() == CSS::ValueID::Hidden) - return value; - if (value->id() == CSS::ValueID::Inset) - return value; - if (value->id() == CSS::ValueID::Outset) - return value; - return nullptr; -} - -class CSSParser { -public: - CSSParser(const CSS::DeprecatedParsingContext& context, const StringView& input) - : m_context(context) - , css(input) - { - } - - bool next_is(const char* str) const - { - size_t len = strlen(str); - for (size_t i = 0; i < len; ++i) { - if (peek(i) != str[i]) - return false; - } - return true; - } - - char peek(size_t offset = 0) const - { - if ((index + offset) < css.length()) - return css[index + offset]; - return 0; - } - - bool consume_specific(char ch) - { - if (peek() != ch) { - dbgln("CSSParser: Peeked '{:c}' wanted specific '{:c}'", peek(), ch); - } - if (!peek()) { - log_parse_error(); - return false; - } - if (peek() != ch) { - log_parse_error(); - ++index; - return false; - } - ++index; - return true; - } - - char consume_one() - { - PARSE_VERIFY(index < css.length()); - return css[index++]; - }; - - bool consume_whitespace_or_comments() - { - size_t original_index = index; - bool in_comment = false; - for (; index < css.length(); ++index) { - char ch = peek(); - if (isspace(ch)) - continue; - if (!in_comment && ch == '/' && peek(1) == '*') { - in_comment = true; - ++index; - continue; - } - if (in_comment && ch == '*' && peek(1) == '/') { - in_comment = false; - ++index; - continue; - } - if (in_comment) - continue; - break; - } - return original_index != index; - } - - static bool is_valid_selector_char(char ch) - { - return isalnum(ch) || ch == '-' || ch == '+' || ch == '_' || ch == '(' || ch == ')' || ch == '@'; - } - - static bool is_valid_selector_args_char(char ch) - { - return is_valid_selector_char(ch) || ch == ' ' || ch == '\t'; - } - - bool is_combinator(char ch) const - { - return ch == '~' || ch == '>' || ch == '+'; - } - - static StringView capture_selector_args(const String& pseudo_name) - { - if (const auto start_pos = pseudo_name.find('('); start_pos.has_value()) { - const auto start = start_pos.value() + 1; - if (const auto end_pos = pseudo_name.find(')', start); end_pos.has_value()) { - return pseudo_name.substring_view(start, end_pos.value() - start).trim_whitespace(); - } - } - return {}; - } - - Optional parse_simple_selector() - { - auto index_at_start = index; - - if (consume_whitespace_or_comments()) - return {}; - - if (!peek() || peek() == '{' || peek() == ',' || is_combinator(peek())) - return {}; - - CSS::Selector::SimpleSelector simple_selector; - - if (peek() == '*') { - simple_selector.type = CSS::Selector::SimpleSelector::Type::Universal; - consume_one(); - return simple_selector; - } - - if (peek() == '.') { - simple_selector.type = CSS::Selector::SimpleSelector::Type::Class; - consume_one(); - } else if (peek() == '#') { - simple_selector.type = CSS::Selector::SimpleSelector::Type::Id; - consume_one(); - } else if (isalpha(peek())) { - simple_selector.type = CSS::Selector::SimpleSelector::Type::TagName; - } else if (peek() == '[') { - simple_selector.type = CSS::Selector::SimpleSelector::Type::Attribute; - } else if (peek() == ':') { - simple_selector.type = CSS::Selector::SimpleSelector::Type::PseudoClass; - } else { - simple_selector.type = CSS::Selector::SimpleSelector::Type::Universal; - } - - if ((simple_selector.type != CSS::Selector::SimpleSelector::Type::Universal) - && (simple_selector.type != CSS::Selector::SimpleSelector::Type::Attribute) - && (simple_selector.type != CSS::Selector::SimpleSelector::Type::PseudoClass)) { - - while (is_valid_selector_char(peek())) - buffer.append(consume_one()); - PARSE_VERIFY(!buffer.is_empty()); - } - - auto value = String::copy(buffer); - - if (simple_selector.type == CSS::Selector::SimpleSelector::Type::TagName) { - // Some stylesheets use uppercase tag names, so here's a hack to just lowercase them internally. - value = value.to_lowercase(); - } - - simple_selector.value = value; - buffer.clear(); - - if (simple_selector.type == CSS::Selector::SimpleSelector::Type::Attribute) { - CSS::Selector::SimpleSelector::Attribute::MatchType attribute_match_type = CSS::Selector::SimpleSelector::Attribute::MatchType::HasAttribute; - String attribute_name; - String attribute_value; - bool in_value = false; - consume_specific('['); - char expected_end_of_attribute_selector = ']'; - while (peek() != expected_end_of_attribute_selector) { - char ch = consume_one(); - if (ch == '=' || (ch == '~' && peek() == '=')) { - if (ch == '=') { - attribute_match_type = CSS::Selector::SimpleSelector::Attribute::MatchType::ExactValueMatch; - } else if (ch == '~') { - consume_one(); - attribute_match_type = CSS::Selector::SimpleSelector::Attribute::MatchType::ContainsWord; - } - attribute_name = String::copy(buffer); - buffer.clear(); - in_value = true; - consume_whitespace_or_comments(); - if (peek() == '\'') { - expected_end_of_attribute_selector = '\''; - consume_one(); - } else if (peek() == '"') { - expected_end_of_attribute_selector = '"'; - consume_one(); - } - continue; - } - // FIXME: This is a hack that will go away when we replace this with a big boy CSS parser. - if (ch == '\\') - ch = consume_one(); - buffer.append(ch); - } - if (in_value) - attribute_value = String::copy(buffer); - else - attribute_name = String::copy(buffer); - buffer.clear(); - simple_selector.attribute.match_type = attribute_match_type; - simple_selector.attribute.name = attribute_name; - simple_selector.attribute.value = attribute_value; - if (expected_end_of_attribute_selector != ']') { - if (!consume_specific(expected_end_of_attribute_selector)) - return {}; - } - consume_whitespace_or_comments(); - if (!consume_specific(']')) - return {}; - } - - if (simple_selector.type == CSS::Selector::SimpleSelector::Type::PseudoClass) { - // FIXME: Implement pseudo elements. - [[maybe_unused]] bool is_pseudo_element = false; - consume_one(); - if (peek() == ':') { - is_pseudo_element = true; - consume_one(); - } - if (next_is("not")) { - buffer.append(consume_one()); - buffer.append(consume_one()); - buffer.append(consume_one()); - if (!consume_specific('(')) - return {}; - buffer.append('('); - while (peek() != ')') - buffer.append(consume_one()); - if (!consume_specific(')')) - return {}; - buffer.append(')'); - } else { - int nesting_level = 0; - while (true) { - const auto ch = peek(); - if (ch == '(') - ++nesting_level; - else if (ch == ')' && nesting_level > 0) - --nesting_level; - - if (nesting_level > 0 ? is_valid_selector_args_char(ch) : is_valid_selector_char(ch)) - buffer.append(consume_one()); - else - break; - }; - } - - auto pseudo_name = String::copy(buffer); - buffer.clear(); - - // Ignore for now, otherwise we produce a "false positive" selector - // and apply styles to the element itself, not its pseudo element - if (is_pseudo_element) - return {}; - - auto& pseudo_class = simple_selector.pseudo_class; - - if (pseudo_name.equals_ignoring_case("link")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Link; - } else if (pseudo_name.equals_ignoring_case("visited")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Visited; - } else if (pseudo_name.equals_ignoring_case("active")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Active; - } else if (pseudo_name.equals_ignoring_case("hover")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Hover; - } else if (pseudo_name.equals_ignoring_case("focus")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Focus; - } else if (pseudo_name.equals_ignoring_case("first-child")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::FirstChild; - } else if (pseudo_name.equals_ignoring_case("last-child")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::LastChild; - } else if (pseudo_name.equals_ignoring_case("only-child")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::OnlyChild; - } else if (pseudo_name.equals_ignoring_case("empty")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Empty; - } else if (pseudo_name.equals_ignoring_case("root")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Root; - } else if (pseudo_name.equals_ignoring_case("first-of-type")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::FirstOfType; - } else if (pseudo_name.equals_ignoring_case("last-of-type")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::LastOfType; - } else if (pseudo_name.starts_with("nth-child", CaseSensitivity::CaseInsensitive)) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::NthChild; - pseudo_class.nth_child_pattern = CSS::Selector::SimpleSelector::ANPlusBPattern::parse(capture_selector_args(pseudo_name)); - } else if (pseudo_name.starts_with("nth-last-child", CaseSensitivity::CaseInsensitive)) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::NthLastChild; - pseudo_class.nth_child_pattern = CSS::Selector::SimpleSelector::ANPlusBPattern::parse(capture_selector_args(pseudo_name)); - } else if (pseudo_name.equals_ignoring_case("before")) { - simple_selector.pseudo_element = CSS::Selector::SimpleSelector::PseudoElement::Before; - } else if (pseudo_name.equals_ignoring_case("after")) { - simple_selector.pseudo_element = CSS::Selector::SimpleSelector::PseudoElement::After; - } else if (pseudo_name.equals_ignoring_case("disabled")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Disabled; - } else if (pseudo_name.equals_ignoring_case("enabled")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Enabled; - } else if (pseudo_name.equals_ignoring_case("checked")) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Checked; - } else if (pseudo_name.starts_with("not", CaseSensitivity::CaseInsensitive)) { - pseudo_class.type = CSS::Selector::SimpleSelector::PseudoClass::Type::Not; - auto not_selector = Web::parse_selector(m_context, capture_selector_args(pseudo_name)); - if (not_selector) { - pseudo_class.not_selector.clear(); - pseudo_class.not_selector.append(not_selector.release_nonnull()); - } - } else { - dbgln("Unknown pseudo class: '{}'", pseudo_name); - return {}; - } - } - - if (index == index_at_start) { - // We consumed nothing. - return {}; - } - - return simple_selector; - } - - Optional parse_complex_selector() - { - auto relation = CSS::Selector::Combinator::Descendant; - - if (peek() == '{' || peek() == ',') - return {}; - - if (is_combinator(peek())) { - switch (peek()) { - case '>': - relation = CSS::Selector::Combinator::ImmediateChild; - break; - case '+': - relation = CSS::Selector::Combinator::NextSibling; - break; - case '~': - relation = CSS::Selector::Combinator::SubsequentSibling; - break; - } - consume_one(); - consume_whitespace_or_comments(); - } - - consume_whitespace_or_comments(); - - Vector simple_selectors; - for (;;) { - auto component = parse_simple_selector(); - if (!component.has_value()) - break; - simple_selectors.append(component.value()); - // If this assert triggers, we're most likely up to no good. - PARSE_VERIFY(simple_selectors.size() < 100); - } - - if (simple_selectors.is_empty()) - return {}; - - return CSS::Selector::CompoundSelector { relation, move(simple_selectors) }; - } - - void parse_selector() - { - Vector complex_selectors; - - for (;;) { - auto index_before = index; - auto complex_selector = parse_complex_selector(); - if (complex_selector.has_value()) - complex_selectors.append(complex_selector.value()); - consume_whitespace_or_comments(); - if (!peek() || peek() == ',' || peek() == '{') - break; - // HACK: If we didn't move forward, just let go. - if (index == index_before) - break; - } - - if (complex_selectors.is_empty()) - return; - complex_selectors.first().combinator = CSS::Selector::Combinator::None; - - current_rule.selectors.append(CSS::Selector::create(move(complex_selectors))); - } - - RefPtr parse_individual_selector() - { - parse_selector(); - if (current_rule.selectors.is_empty()) - return {}; - return current_rule.selectors.last(); - } - - void parse_selector_list() - { - for (;;) { - auto index_before = index; - parse_selector(); - consume_whitespace_or_comments(); - if (peek() == ',') { - consume_one(); - continue; - } - if (peek() == '{') - break; - // HACK: If we didn't move forward, just let go. - if (index_before == index) - break; - } - } - - bool is_valid_property_name_char(char ch) const - { - return ch && !isspace(ch) && ch != ':'; - } - - bool is_valid_property_value_char(char ch) const - { - return ch && ch != '!' && ch != ';' && ch != '}'; - } - - bool is_valid_string_quotes_char(char ch) const - { - return ch == '\'' || ch == '\"'; - } - - struct ValueAndImportant { - String value; - bool important { false }; - }; - - ValueAndImportant consume_css_value() - { - buffer.clear(); - - int paren_nesting_level = 0; - bool important = false; - - for (;;) { - char ch = peek(); - if (ch == '(') { - ++paren_nesting_level; - buffer.append(consume_one()); - continue; - } - if (ch == ')') { - PARSE_VERIFY(paren_nesting_level > 0); - --paren_nesting_level; - buffer.append(consume_one()); - continue; - } - if (paren_nesting_level > 0) { - buffer.append(consume_one()); - continue; - } - if (next_is("!important")) { - consume_specific('!'); - consume_specific('i'); - consume_specific('m'); - consume_specific('p'); - consume_specific('o'); - consume_specific('r'); - consume_specific('t'); - consume_specific('a'); - consume_specific('n'); - consume_specific('t'); - important = true; - continue; - } - if (next_is("/*")) { - consume_whitespace_or_comments(); - continue; - } - if (!ch) - break; - if (ch == '\\') { - consume_one(); - buffer.append(consume_one()); - continue; - } - if (ch == '}') - break; - if (ch == ';') - break; - buffer.append(consume_one()); - } - - // Remove trailing whitespace. - while (!buffer.is_empty() && isspace(buffer.last())) - buffer.take_last(); - - auto string = String::copy(buffer); - buffer.clear(); - - return { string, important }; - } - - Optional parse_property() - { - consume_whitespace_or_comments(); - if (peek() == ';') { - consume_one(); - return {}; - } - if (peek() == '}') - return {}; - buffer.clear(); - while (is_valid_property_name_char(peek())) - buffer.append(consume_one()); - auto property_name = String::copy(buffer); - buffer.clear(); - consume_whitespace_or_comments(); - if (!consume_specific(':')) - return {}; - consume_whitespace_or_comments(); - - auto [property_value, important] = consume_css_value(); - - consume_whitespace_or_comments(); - - if (peek() && peek() != '}') { - if (!consume_specific(';')) - return {}; - } - - auto property_id = CSS::property_id_from_string(property_name); - - if (property_id == CSS::PropertyID::Invalid && property_name.starts_with("--")) - property_id = CSS::PropertyID::Custom; - - if (property_id == CSS::PropertyID::Invalid && !property_name.starts_with("-")) { - dbgln("CSSParser: Unrecognized property '{}'", property_name); - } - auto value = parse_css_value(m_context, property_value, property_id); - if (!value) - return {}; - if (property_id == CSS::PropertyID::Custom) { - return CSS::StyleProperty { property_id, value.release_nonnull(), property_name, important }; - } - return CSS::StyleProperty { property_id, value.release_nonnull(), {}, important }; - } - - void parse_declaration() - { - for (;;) { - auto property = parse_property(); - if (property.has_value()) { - auto property_value = property.value(); - if (property_value.property_id == CSS::PropertyID::Custom) - current_rule.custom_properties.set(property_value.custom_name, property_value); - else - current_rule.properties.append(property_value); - } - consume_whitespace_or_comments(); - if (!peek() || peek() == '}') - break; - } - } - - void parse_style_rule() - { - parse_selector_list(); - if (!consume_specific('{')) { - log_parse_error(); - return; - } - parse_declaration(); - if (!consume_specific('}')) { - log_parse_error(); - return; - } - - rules.append(CSS::CSSStyleRule::create(move(current_rule.selectors), CSS::CSSStyleDeclaration::create(move(current_rule.properties), move(current_rule.custom_properties)))); - } - - Optional parse_string() - { - if (!is_valid_string_quotes_char(peek())) { - log_parse_error(); - return {}; - } - - char end_char = consume_one(); - buffer.clear(); - while (peek() && peek() != end_char) { - if (peek() == '\\') { - consume_specific('\\'); - if (peek() == 0) - break; - } - buffer.append(consume_one()); - } - - String string_value(String::copy(buffer)); - buffer.clear(); - - if (consume_specific(end_char)) { - return { string_value }; - } - return {}; - } - - Optional parse_url() - { - if (is_valid_string_quotes_char(peek())) - return parse_string(); - - buffer.clear(); - while (peek() && peek() != ')') - buffer.append(consume_one()); - - String url_value(String::copy(buffer)); - buffer.clear(); - - if (peek() == ')') - return { url_value }; - return {}; - } - - void parse_at_import_rule() - { - consume_whitespace_or_comments(); - Optional imported_address; - if (is_valid_string_quotes_char(peek())) { - imported_address = parse_string(); - } else if (next_is("url")) { - consume_specific('u'); - consume_specific('r'); - consume_specific('l'); - - consume_whitespace_or_comments(); - - if (!consume_specific('(')) - return; - imported_address = parse_url(); - if (!consume_specific(')')) - return; - } else { - log_parse_error(); - return; - } - - if (imported_address.has_value()) - rules.append(CSS::CSSImportRule::create(m_context.complete_url(imported_address.value()))); - - // FIXME: We ignore possible media query list - while (peek() && peek() != ';') - consume_one(); - - consume_specific(';'); - } - - void parse_at_rule() - { - HashMap at_rules_parsers({ { "@import", &CSSParser::parse_at_import_rule } }); - - for (const auto& rule_parser_pair : at_rules_parsers) { - if (next_is(rule_parser_pair.key.characters())) { - for (char c : rule_parser_pair.key) { - consume_specific(c); - } - (this->*(rule_parser_pair.value))(); - return; - } - } - - // FIXME: We ignore other @-rules completely for now. - int level = 0; - bool in_comment = false; - - while (peek() != 0) { - auto ch = consume_one(); - - if (!in_comment) { - if (ch == '/' && peek() == '*') { - consume_one(); - in_comment = true; - } else if (ch == '{') { - ++level; - } else if (ch == '}') { - --level; - if (level == 0) - break; - } - } else { - if (ch == '*' && peek() == '/') { - consume_one(); - in_comment = false; - } - } - } - } - - void parse_rule() - { - consume_whitespace_or_comments(); - if (!peek()) - return; - - if (peek() == '@') { - parse_at_rule(); - } else { - parse_style_rule(); - } - - consume_whitespace_or_comments(); - } - - RefPtr parse_sheet() - { - if (peek(0) == (char)0xef && peek(1) == (char)0xbb && peek(2) == (char)0xbf) { - // HACK: Skip UTF-8 BOM. - index += 3; - } - - while (peek()) { - parse_rule(); - } - - return CSS::CSSStyleSheet::create(move(rules)); - } - - RefPtr parse_standalone_declaration() - { - consume_whitespace_or_comments(); - for (;;) { - auto property = parse_property(); - if (property.has_value()) { - auto property_value = property.value(); - if (property_value.property_id == CSS::PropertyID::Custom) - current_rule.custom_properties.set(property_value.custom_name, property_value); - else - current_rule.properties.append(property_value); - } - consume_whitespace_or_comments(); - if (!peek()) - break; - } - return CSS::CSSStyleDeclaration::create(move(current_rule.properties), move(current_rule.custom_properties)); - } - -private: - CSS::DeprecatedParsingContext m_context; - - NonnullRefPtrVector rules; - - struct CurrentRule { - NonnullRefPtrVector selectors; - Vector properties; - HashMap custom_properties; - }; - - CurrentRule current_rule; - Vector buffer; - - size_t index = 0; - - StringView css; -}; - -RefPtr parse_selector(const CSS::DeprecatedParsingContext& context, const StringView& selector_text) -{ - CSSParser parser(context, selector_text); - return parser.parse_individual_selector(); -} - -RefPtr parse_css(const CSS::DeprecatedParsingContext& context, const StringView& css) -{ - if (css.is_empty()) - return CSS::CSSStyleSheet::create({}); - CSSParser parser(context, css); - return parser.parse_sheet(); -} - -RefPtr parse_css_declaration(const CSS::DeprecatedParsingContext& context, const StringView& css) -{ - if (css.is_empty()) - return CSS::CSSStyleDeclaration::create({}, {}); - CSSParser parser(context, css); - return parser.parse_standalone_declaration(); -} - -RefPtr parse_html_length(const DOM::Document& document, const StringView& string) -{ - auto integer = string.to_int(); - if (integer.has_value()) - return CSS::LengthStyleValue::create(CSS::Length::make_px(integer.value())); - return parse_css_value(CSS::DeprecatedParsingContext(document), string); -} -} diff --git a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h b/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h deleted file mode 100644 index e60c056ded5..00000000000 --- a/Userland/Libraries/LibWeb/CSS/Parser/DeprecatedCSSParser.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include - -namespace Web::CSS { -class DeprecatedParsingContext { -public: - DeprecatedParsingContext(); - explicit DeprecatedParsingContext(const DOM::Document&); - explicit DeprecatedParsingContext(const DOM::ParentNode&); - - bool in_quirks_mode() const; - - URL complete_url(const String&) const; - -private: - const DOM::Document* m_document { nullptr }; -}; -} - -namespace Web { - -RefPtr parse_css(const CSS::DeprecatedParsingContext&, const StringView&); -RefPtr parse_css_declaration(const CSS::DeprecatedParsingContext&, const StringView&); -RefPtr parse_css_value(const CSS::DeprecatedParsingContext&, const StringView&, CSS::PropertyID property_id = CSS::PropertyID::Invalid); -RefPtr parse_selector(const CSS::DeprecatedParsingContext&, const StringView&); - -RefPtr parse_line_width(const CSS::DeprecatedParsingContext&, const StringView&); -RefPtr parse_color(const CSS::DeprecatedParsingContext&, const StringView&); -RefPtr parse_line_style(const CSS::DeprecatedParsingContext&, const StringView&); - -RefPtr parse_html_length(const DOM::Document&, const StringView&); - -} diff --git a/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp b/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp index d614a3d3d48..a128deece83 100644 --- a/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp +++ b/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp b/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp index d9b84b1cb35..936d77a414b 100644 --- a/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp +++ b/Userland/Libraries/LibWeb/CSS/StyleResolver.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -36,7 +35,7 @@ static StyleSheet& default_stylesheet() if (!sheet) { extern char const default_stylesheet_source[]; String css = default_stylesheet_source; - sheet = parse_css(CSS::DeprecatedParsingContext(), css).leak_ref(); + sheet = parse_css(CSS::ParsingContext(), css).leak_ref(); } return *sheet; } @@ -47,7 +46,7 @@ static StyleSheet& quirks_mode_stylesheet() if (!sheet) { extern char const quirks_mode_stylesheet_source[]; String css = quirks_mode_stylesheet_source; - sheet = parse_css(CSS::DeprecatedParsingContext(), css).leak_ref(); + sheet = parse_css(CSS::ParsingContext(), css).leak_ref(); } return *sheet; } @@ -524,7 +523,6 @@ static inline bool is_text_decoration_style(StyleValue const& value) static void set_property_expanding_shorthands(StyleProperties& style, CSS::PropertyID property_id, StyleValue const& value, DOM::Document& document, bool is_internally_generated_pseudo_property = false) { - CSS::DeprecatedParsingContext deprecated_context(document); CSS::ParsingContext context(document); if (is_pseudo_property(property_id) && !is_internally_generated_pseudo_property) { @@ -617,48 +615,7 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope style.set_property(CSS::PropertyID::BorderBottomLeftRadius, value); return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 2) { - auto diagonal1 = parse_css_value(deprecated_context, parts[0]); - auto diagonal2 = parse_css_value(deprecated_context, parts[1]); - if (diagonal1 && diagonal2) { - style.set_property(CSS::PropertyID::BorderTopLeftRadius, *diagonal1); - style.set_property(CSS::PropertyID::BorderBottomRightRadius, *diagonal1); - style.set_property(CSS::PropertyID::BorderTopRightRadius, *diagonal2); - style.set_property(CSS::PropertyID::BorderBottomLeftRadius, *diagonal2); - } - return; - } - if (parts.size() == 3) { - auto top_left = parse_css_value(deprecated_context, parts[0]); - auto diagonal = parse_css_value(deprecated_context, parts[1]); - auto bottom_right = parse_css_value(deprecated_context, parts[2]); - if (top_left && diagonal && bottom_right) { - style.set_property(CSS::PropertyID::BorderTopLeftRadius, *top_left); - style.set_property(CSS::PropertyID::BorderBottomRightRadius, *bottom_right); - style.set_property(CSS::PropertyID::BorderTopRightRadius, *diagonal); - style.set_property(CSS::PropertyID::BorderBottomLeftRadius, *diagonal); - } - return; - } - if (parts.size() == 4) { - auto top_left = parse_css_value(deprecated_context, parts[0]); - auto top_right = parse_css_value(deprecated_context, parts[1]); - auto bottom_right = parse_css_value(deprecated_context, parts[2]); - auto bottom_left = parse_css_value(deprecated_context, parts[3]); - if (top_left && top_right && bottom_right && bottom_left) { - style.set_property(CSS::PropertyID::BorderTopLeftRadius, *top_left); - style.set_property(CSS::PropertyID::BorderBottomRightRadius, *bottom_right); - style.set_property(CSS::PropertyID::BorderTopRightRadius, *top_right); - style.set_property(CSS::PropertyID::BorderBottomLeftRadius, *bottom_left); - } - return; - } - dbgln("Unsure what to do with CSS border-radius value '{}'", value.to_string()); - return; - } + if (value.is_value_list()) { auto& parts = static_cast(value).values(); if (parts.size() == 2) { @@ -736,54 +693,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - - if (parts.size() == 1) { - if (auto value = parse_line_style(deprecated_context, parts[0])) { - set_property_border_style(style, value.release_nonnull(), edge); - set_property_border_color(style, ColorStyleValue::create(Gfx::Color::Black), edge); - set_property_border_width(style, LengthStyleValue::create(Length(3, Length::Type::Px)), edge); - return; - } - } - - RefPtr line_width_value; - RefPtr color_value; - RefPtr line_style_value; - - for (auto& part : parts) { - if (auto value = parse_line_width(deprecated_context, part)) { - if (line_width_value) - return; - line_width_value = move(value); - continue; - } - if (auto value = parse_color(deprecated_context, part)) { - if (color_value) - return; - color_value = move(value); - continue; - } - if (auto value = parse_line_style(deprecated_context, 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(), edge); - if (color_value) - set_property_border_color(style, color_value.release_nonnull(), edge); - if (line_style_value) - set_property_border_style(style, line_style_value.release_nonnull(), edge); - - return; - } - if (value.is_value_list()) { auto& parts = static_cast(value).values(); @@ -839,49 +748,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::BorderStyle) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 4) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto right = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - auto left = parse_css_value(deprecated_context, parts[3]); - if (top && right && bottom && left) { - style.set_property(CSS::PropertyID::BorderTopStyle, *top); - style.set_property(CSS::PropertyID::BorderRightStyle, *right); - style.set_property(CSS::PropertyID::BorderBottomStyle, *bottom); - style.set_property(CSS::PropertyID::BorderLeftStyle, *left); - } - } else if (parts.size() == 3) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto right = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - auto left = parse_css_value(deprecated_context, parts[1]); - if (top && right && bottom && left) { - style.set_property(CSS::PropertyID::BorderTopStyle, *top); - style.set_property(CSS::PropertyID::BorderRightStyle, *right); - style.set_property(CSS::PropertyID::BorderBottomStyle, *bottom); - style.set_property(CSS::PropertyID::BorderLeftStyle, *left); - } - } else if (parts.size() == 2) { - auto vertical = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - if (vertical && horizontal) { - style.set_property(CSS::PropertyID::BorderTopStyle, *vertical); - style.set_property(CSS::PropertyID::BorderRightStyle, *horizontal); - style.set_property(CSS::PropertyID::BorderBottomStyle, *vertical); - style.set_property(CSS::PropertyID::BorderLeftStyle, *horizontal); - } - } 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; - } - if (value.is_value_list()) { auto& parts = static_cast(value).values(); if (parts.size() == 4) { @@ -935,48 +801,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::BorderWidth) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 4) { - auto top_border_width = parse_css_value(deprecated_context, parts[0]); - auto right_border_width = parse_css_value(deprecated_context, parts[1]); - auto bottom_border_width = parse_css_value(deprecated_context, parts[2]); - auto left_border_width = parse_css_value(deprecated_context, parts[3]); - if (top_border_width && right_border_width && bottom_border_width && left_border_width) { - style.set_property(CSS::PropertyID::BorderTopWidth, *top_border_width); - style.set_property(CSS::PropertyID::BorderRightWidth, *right_border_width); - style.set_property(CSS::PropertyID::BorderBottomWidth, *bottom_border_width); - style.set_property(CSS::PropertyID::BorderLeftWidth, *left_border_width); - } - } else if (parts.size() == 3) { - auto top_border_width = parse_css_value(deprecated_context, parts[0]); - auto horizontal_border_width = parse_css_value(deprecated_context, parts[1]); - auto bottom_border_width = parse_css_value(deprecated_context, parts[2]); - if (top_border_width && horizontal_border_width && bottom_border_width) { - style.set_property(CSS::PropertyID::BorderTopWidth, *top_border_width); - style.set_property(CSS::PropertyID::BorderRightWidth, *horizontal_border_width); - style.set_property(CSS::PropertyID::BorderBottomWidth, *bottom_border_width); - style.set_property(CSS::PropertyID::BorderLeftWidth, *horizontal_border_width); - } - } else if (parts.size() == 2) { - auto vertical_border_width = parse_css_value(deprecated_context, parts[0]); - auto horizontal_border_width = parse_css_value(deprecated_context, parts[1]); - if (vertical_border_width && horizontal_border_width) { - style.set_property(CSS::PropertyID::BorderTopWidth, *vertical_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::BorderLeftWidth, *horizontal_border_width); - } - } else { - 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); - } - return; - } - if (value.is_value_list()) { auto& parts = static_cast(value).values(); if (parts.size() == 4) { @@ -1029,48 +853,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::BorderColor) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 4) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto right = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - auto left = parse_css_value(deprecated_context, parts[3]); - if (top && right && bottom && left) { - style.set_property(CSS::PropertyID::BorderTopColor, *top); - style.set_property(CSS::PropertyID::BorderRightColor, *right); - style.set_property(CSS::PropertyID::BorderBottomColor, *bottom); - style.set_property(CSS::PropertyID::BorderLeftColor, *left); - } - } else if (parts.size() == 3) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - if (top && horizontal && bottom) { - style.set_property(CSS::PropertyID::BorderTopColor, *top); - style.set_property(CSS::PropertyID::BorderRightColor, *horizontal); - style.set_property(CSS::PropertyID::BorderBottomColor, *bottom); - style.set_property(CSS::PropertyID::BorderLeftColor, *horizontal); - } - } else if (parts.size() == 2) { - auto vertical = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - if (vertical && horizontal) { - style.set_property(CSS::PropertyID::BorderTopColor, *vertical); - style.set_property(CSS::PropertyID::BorderRightColor, *horizontal); - style.set_property(CSS::PropertyID::BorderBottomColor, *vertical); - style.set_property(CSS::PropertyID::BorderLeftColor, *horizontal); - } - } 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; - } - if (value.is_value_list()) { auto& parts = static_cast(value).values(); if (parts.size() == 4) { @@ -1138,46 +920,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - NonnullRefPtrVector values; - for (auto& part : parts) { - auto value = parse_css_value(deprecated_context, part); - if (!value) - return; - values.append(value.release_nonnull()); - } - - // HACK: Disallow more than one color value in a 'background' shorthand - size_t color_value_count = 0; - for (auto& value : values) - color_value_count += value.is_color(); - - if (values[0].is_color() && color_value_count == 1) - style.set_property(CSS::PropertyID::BackgroundColor, values[0]); - - for (auto it = values.begin(); it != values.end(); ++it) { - auto& value = *it; - - if (is_background_repeat(value)) { - if ((it + 1 != values.end()) && is_background_repeat(*(it + 1))) { - ++it; - - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundRepeatX, value, document, true); - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundRepeatY, *it, document, true); - } else { - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundRepeat, value, document); - } - } - - if (!value.is_string()) - continue; - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundImage, value, document); - } - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); @@ -1319,27 +1061,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope assign_background_repeat_from_single_value(value); } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - NonnullRefPtrVector values; - for (auto& part : parts) { - auto value = parse_css_value(deprecated_context, part); - if (!value || !is_background_repeat(*value)) - return; - values.append(value.release_nonnull()); - } - - if (values.size() == 1) { - assign_background_repeat_from_single_value(values[0]); - } else if (values.size() == 2) { - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundRepeatX, values[0], document, true); - set_property_expanding_shorthands(style, CSS::PropertyID::BackgroundRepeatY, values[1], document, true); - } - - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); NonnullRefPtrVector repeat_values; @@ -1381,47 +1102,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 2) { - auto vertical = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - if (vertical && horizontal) { - style.set_property(CSS::PropertyID::MarginTop, *vertical); - style.set_property(CSS::PropertyID::MarginBottom, *vertical); - style.set_property(CSS::PropertyID::MarginLeft, *horizontal); - style.set_property(CSS::PropertyID::MarginRight, *horizontal); - } - return; - } else if (parts.size() == 3) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - if (top && horizontal && bottom) { - style.set_property(CSS::PropertyID::MarginTop, *top); - style.set_property(CSS::PropertyID::MarginBottom, *bottom); - style.set_property(CSS::PropertyID::MarginLeft, *horizontal); - style.set_property(CSS::PropertyID::MarginRight, *horizontal); - } - return; - } else if (parts.size() == 4) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto right = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - auto left = parse_css_value(deprecated_context, parts[3]); - if (top && right && bottom && left) { - style.set_property(CSS::PropertyID::MarginTop, *top); - style.set_property(CSS::PropertyID::MarginBottom, *bottom); - style.set_property(CSS::PropertyID::MarginLeft, *left); - style.set_property(CSS::PropertyID::MarginRight, *right); - } - return; - } - dbgln("Unsure what to do with CSS margin value '{}'", value.to_string()); - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); if (parts.size() == 2) { @@ -1473,47 +1153,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 2) { - auto vertical = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - if (vertical && horizontal) { - style.set_property(CSS::PropertyID::PaddingTop, *vertical); - style.set_property(CSS::PropertyID::PaddingBottom, *vertical); - style.set_property(CSS::PropertyID::PaddingLeft, *horizontal); - style.set_property(CSS::PropertyID::PaddingRight, *horizontal); - } - return; - } else if (parts.size() == 3) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto horizontal = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - if (top && bottom && horizontal) { - style.set_property(CSS::PropertyID::PaddingTop, *top); - style.set_property(CSS::PropertyID::PaddingBottom, *bottom); - style.set_property(CSS::PropertyID::PaddingLeft, *horizontal); - style.set_property(CSS::PropertyID::PaddingRight, *horizontal); - } - return; - } else if (parts.size() == 4) { - auto top = parse_css_value(deprecated_context, parts[0]); - auto right = parse_css_value(deprecated_context, parts[1]); - auto bottom = parse_css_value(deprecated_context, parts[2]); - auto left = parse_css_value(deprecated_context, parts[3]); - if (top && bottom && left && right) { - style.set_property(CSS::PropertyID::PaddingTop, *top); - style.set_property(CSS::PropertyID::PaddingBottom, *bottom); - style.set_property(CSS::PropertyID::PaddingLeft, *left); - style.set_property(CSS::PropertyID::PaddingRight, *right); - } - return; - } - dbgln("Unsure what to do with CSS padding value '{}'", value.to_string()); - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); if (parts.size() == 2) { @@ -1557,18 +1196,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::ListStyle) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (!parts.is_empty()) { - auto value = parse_css_value(deprecated_context, parts[0]); - if (!value) - return; - style.set_property(CSS::PropertyID::ListStyleType, value.release_nonnull()); - } - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); @@ -1626,30 +1253,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::Font) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() < 2) - return; - auto size_parts = parts[0].split_view('/'); - if (size_parts.size() == 2) { - auto size = parse_css_value(deprecated_context, size_parts[0]); - auto line_height = parse_css_value(deprecated_context, size_parts[1]); - if (!size || !line_height) - return; - style.set_property(CSS::PropertyID::FontSize, size.release_nonnull()); - style.set_property(CSS::PropertyID::LineHeight, line_height.release_nonnull()); - } else if (size_parts.size() == 1) { - auto size = parse_css_value(deprecated_context, parts[0]); - if (!size) - return; - style.set_property(CSS::PropertyID::FontSize, size.release_nonnull()); - } - auto family = parse_css_value(deprecated_context, parts[1]); - style.set_property(CSS::PropertyID::FontFamily, family.release_nonnull()); - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); @@ -1779,44 +1382,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope return; } - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.size() == 1) { - auto flex_grow = parse_css_value(deprecated_context, parts[0]); - style.set_property(CSS::PropertyID::FlexGrow, *flex_grow); - return; - } - - if (parts.size() == 2) { - auto flex_grow = parse_css_value(deprecated_context, parts[0]); - style.set_property(CSS::PropertyID::FlexGrow, *flex_grow); - - auto second_value = parse_css_value(deprecated_context, parts[1]); - if (second_value->is_length() || (second_value->is_identifier() && second_value->to_identifier() == CSS::ValueID::Content)) { - style.set_property(CSS::PropertyID::FlexBasis, *second_value); - } else { - auto flex_shrink = parse_css_value(deprecated_context, parts[1]); - style.set_property(CSS::PropertyID::FlexShrink, *flex_shrink); - } - return; - } - - if (parts.size() == 3) { - auto flex_grow = parse_css_value(deprecated_context, parts[0]); - style.set_property(CSS::PropertyID::FlexGrow, *flex_grow); - auto flex_shrink = parse_css_value(deprecated_context, parts[1]); - style.set_property(CSS::PropertyID::FlexShrink, *flex_shrink); - - auto third_value = parse_css_value(deprecated_context, parts[2]); - if (third_value->is_length() || (third_value->is_identifier() && third_value->to_identifier() == CSS::ValueID::Content)) - style.set_property(CSS::PropertyID::FlexBasis, *third_value); - return; - } - - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); if (parts.size() == 1) { @@ -1871,22 +1436,6 @@ static void set_property_expanding_shorthands(StyleProperties& style, CSS::Prope } if (property_id == CSS::PropertyID::FlexFlow) { - // FIXME: Remove string parsing once DeprecatedCSSParser is gone. - if (value.is_string()) { - auto parts = split_on_whitespace(value.to_string()); - if (parts.is_empty()) - return; - - auto direction = parse_css_value(deprecated_context, parts[0]); - style.set_property(CSS::PropertyID::FlexDirection, direction.release_nonnull()); - - if (parts.size() > 1) { - auto wrap = parse_css_value(deprecated_context, parts[1]); - style.set_property(CSS::PropertyID::FlexWrap, wrap.release_nonnull()); - } - return; - } - if (value.is_value_list()) { auto parts = static_cast(value).values(); if (parts.is_empty() || parts.size() > 2) diff --git a/Userland/Libraries/LibWeb/DOM/Element.cpp b/Userland/Libraries/LibWeb/DOM/Element.cpp index 3bdd6d9aefc..59b4cdecc47 100644 --- a/Userland/Libraries/LibWeb/DOM/Element.cpp +++ b/Userland/Libraries/LibWeb/DOM/Element.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -158,7 +158,7 @@ void Element::parse_attribute(const FlyString& name, const String& value) m_classes.unchecked_append(new_class); } } else if (name == HTML::AttributeNames::style) { - m_inline_style = parse_css_declaration(CSS::DeprecatedParsingContext(document()), value); + m_inline_style = parse_css_declaration(CSS::ParsingContext(document()), value); set_needs_style_update(true); } } diff --git a/Userland/Libraries/LibWeb/DOM/ParentNode.cpp b/Userland/Libraries/LibWeb/DOM/ParentNode.cpp index 9a8ffdde327..8562c151c82 100644 --- a/Userland/Libraries/LibWeb/DOM/ParentNode.cpp +++ b/Userland/Libraries/LibWeb/DOM/ParentNode.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include @@ -13,17 +13,22 @@ namespace Web::DOM { RefPtr ParentNode::query_selector(const StringView& selector_text) { - auto selector = parse_selector(CSS::DeprecatedParsingContext(*this), selector_text); - if (!selector) + auto maybe_selectors = parse_selector(CSS::ParsingContext(*this), selector_text); + if (!maybe_selectors.has_value()) return {}; - dump_selector(*selector); + auto selectors = maybe_selectors.value(); + + for (auto& selector : selectors) + dump_selector(selector); RefPtr result; for_each_in_inclusive_subtree_of_type([&](auto& element) { - if (SelectorEngine::matches(*selector, element)) { - result = element; - return IterationDecision::Break; + for (auto& selector : selectors) { + if (SelectorEngine::matches(selector, element)) { + result = element; + return IterationDecision::Break; + } } return IterationDecision::Continue; }); @@ -33,16 +38,21 @@ RefPtr ParentNode::query_selector(const StringView& selector_text) NonnullRefPtrVector ParentNode::query_selector_all(const StringView& selector_text) { - auto selector = parse_selector(CSS::DeprecatedParsingContext(*this), selector_text); - if (!selector) + auto maybe_selectors = parse_selector(CSS::ParsingContext(*this), selector_text); + if (!maybe_selectors.has_value()) return {}; - dump_selector(*selector); + auto selectors = maybe_selectors.value(); + + for (auto& selector : selectors) + dump_selector(selector); NonnullRefPtrVector elements; for_each_in_inclusive_subtree_of_type([&](auto& element) { - if (SelectorEngine::matches(*selector, element)) { - elements.append(element); + for (auto& selector : selectors) { + if (SelectorEngine::matches(selector, element)) { + elements.append(element); + } } return IterationDecision::Continue; }); diff --git a/Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp index d17b0c63cf1..039e58f3e7f 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLImageElement.cpp @@ -5,7 +5,7 @@ */ #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.cpp index 313f118b4d0..a2b7b4e6a2b 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp index c3f4e78dd38..81c7446c785 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include namespace Web::HTML { diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLTableElement.cpp index 69af3df3aa8..93bc19b5bf8 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLTableElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLTableElement.cpp @@ -5,7 +5,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/Loader/CSSLoader.cpp b/Userland/Libraries/LibWeb/Loader/CSSLoader.cpp index 0ebbda68254..742d205676c 100644 --- a/Userland/Libraries/LibWeb/Loader/CSSLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/CSSLoader.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include @@ -21,7 +21,7 @@ CSSLoader::CSSLoader(DOM::Element& owner_element) void CSSLoader::load_from_text(const String& text) { - m_style_sheet = parse_css(CSS::DeprecatedParsingContext(m_owner_element.document()), text); + m_style_sheet = parse_css(CSS::ParsingContext(m_owner_element.document()), text); if (!m_style_sheet) { m_style_sheet = CSS::CSSStyleSheet::create({}); m_style_sheet->set_owner_node(&m_owner_element); @@ -49,7 +49,7 @@ void CSSLoader::resource_did_load() dbgln_if(CSS_LOADER_DEBUG, "CSSLoader: Resource did load, has encoded data. URL: {}", resource()->url()); } - auto sheet = parse_css(CSS::DeprecatedParsingContext(m_owner_element.document()), resource()->encoded_data()); + auto sheet = parse_css(CSS::ParsingContext(m_owner_element.document()), resource()->encoded_data()); if (!sheet) { dbgln_if(CSS_LOADER_DEBUG, "CSSLoader: Failed to parse stylesheet: {}", resource()->url()); return;