From e30b702c6c769644d8812212222fa6b4af6abcd2 Mon Sep 17 00:00:00 2001 From: Sam Atkins Date: Sun, 12 Sep 2021 17:05:27 +0100 Subject: [PATCH] LibWeb: Reduce CSS_PARSER_DEBUG spam Having every single function emit a debug message was useful at the time, but now makes it impossible to spot important things. --- .../Libraries/LibWeb/CSS/Parser/Parser.cpp | 64 +------------------ 1 file changed, 3 insertions(+), 61 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index afb454a57c..9d77cb3864 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -161,8 +161,6 @@ NonnullRefPtr Parser::parse_as_stylesheet() template NonnullRefPtr Parser::parse_a_stylesheet(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_stylesheet"); - auto parser_rules = consume_a_list_of_rules(tokens, true); NonnullRefPtrVector rules; @@ -187,8 +185,6 @@ Optional Parser::parse_as_selector() template Optional Parser::parse_a_selector(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_a_selector"); - auto selector_list = parse_a_selector_list(tokens); if (selector_list.has_value()) return selector_list; @@ -204,8 +200,6 @@ Optional Parser::parse_as_relative_selector() template Optional Parser::parse_a_relative_selector(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_a_relative_selector"); - auto selector_list = parse_a_relative_selector_list(tokens); if (selector_list.has_value()) return selector_list; @@ -216,8 +210,6 @@ Optional Parser::parse_a_relative_selector(TokenStream& tokens) template Optional Parser::parse_a_selector_list(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_a_selector_list"); - auto comma_separated_lists = parse_a_comma_separated_list_of_component_values(tokens); NonnullRefPtrVector selectors; @@ -239,8 +231,6 @@ Optional Parser::parse_a_selector_list(TokenStream& tokens) template Optional Parser::parse_a_relative_selector_list(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_a_relative_selector_list"); - auto comma_separated_lists = parse_a_comma_separated_list_of_component_values(tokens); NonnullRefPtrVector selectors; @@ -261,8 +251,6 @@ Optional Parser::parse_a_relative_selector_list(TokenStream& to RefPtr Parser::parse_complex_selector(TokenStream& tokens, bool allow_starting_combinator) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_complex_selector"); - Vector compound_selectors; auto first_selector = parse_compound_selector(tokens); @@ -294,8 +282,6 @@ RefPtr Parser::parse_complex_selector(TokenStream Parser::parse_compound_selector(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_compound_selector"); - tokens.skip_whitespace(); auto combinator = parse_selector_combinator(tokens).value_or(Selector::Combinator::Descendant); @@ -324,8 +310,6 @@ Result Parser::parse_ Optional Parser::parse_selector_combinator(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_selector_combinator"); - auto& current_value = tokens.next_token(); if (current_value.is(Token::Type::Delim)) { auto delim = current_value.token().delim(); @@ -353,8 +337,6 @@ Optional Parser::parse_selector_combinator(TokenStream Parser::parse_simple_selector(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_simple_selector"); - auto peek_token_ends_selector = [&]() -> bool { auto& value = tokens.peek_token(); return (value.is(Token::Type::EndOfFile) || value.is(Token::Type::Whitespace) || value.is(Token::Type::Comma)); @@ -659,8 +641,6 @@ NonnullRefPtrVector Parser::consume_a_list_of_rules(bool top_level) template NonnullRefPtrVector Parser::consume_a_list_of_rules(TokenStream& tokens, bool top_level) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_list_of_rules"); - NonnullRefPtrVector rules; for (;;) { @@ -712,8 +692,6 @@ NonnullRefPtr Parser::consume_an_at_rule() template NonnullRefPtr Parser::consume_an_at_rule(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_an_at_rule"); - auto& name_ident = tokens.next_token(); VERIFY(name_ident.is(Token::Type::AtKeyword)); @@ -752,8 +730,6 @@ RefPtr Parser::consume_a_qualified_rule() template RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_qualified_rule"); - auto rule = make_ref_counted(StyleRule::Type::Qualified); for (;;) { @@ -782,16 +758,12 @@ RefPtr Parser::consume_a_qualified_rule(TokenStream& tokens) template<> StyleComponentValueRule Parser::consume_a_component_value(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_component_value - shortcut: '{}'", tokens.peek_token().to_debug_string()); - return tokens.next_token(); } template StyleComponentValueRule Parser::consume_a_component_value(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_component_value"); - auto& token = tokens.next_token(); if (token.is(Token::Type::OpenCurly) || token.is(Token::Type::OpenSquare) || token.is(Token::Type::OpenParen)) @@ -816,8 +788,6 @@ NonnullRefPtr Parser::consume_a_simple_block() template NonnullRefPtr Parser::consume_a_simple_block(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_simple_block"); - auto ending_token = ((Token)tokens.current_token()).mirror_variant(); auto block = make_ref_counted(); @@ -849,8 +819,6 @@ NonnullRefPtr Parser::consume_a_function() template NonnullRefPtr Parser::consume_a_function(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_function"); - auto name_ident = tokens.current_token(); VERIFY(name_ident.is(Token::Type::Function)); auto function = make_ref_counted(((Token)name_ident).m_value.to_string()); @@ -882,8 +850,6 @@ Optional Parser::consume_a_declaration() template Optional Parser::consume_a_declaration(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_declaration"); - auto& token = tokens.next_token(); StyleDeclarationRule declaration; @@ -944,8 +910,6 @@ Vector Parser::consume_a_list_of_declarations() template Vector Parser::consume_a_list_of_declarations(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::consume_a_list_of_declarations"); - Vector list; for (;;) { @@ -1007,8 +971,6 @@ RefPtr Parser::parse_as_rule() template RefPtr Parser::parse_a_rule(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_rule"); - RefPtr rule; tokens.skip_whitespace(); @@ -1046,8 +1008,6 @@ NonnullRefPtrVector Parser::parse_as_list_of_rules() template NonnullRefPtrVector Parser::parse_a_list_of_rules(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_list_of_rules"); - auto parsed_rules = consume_a_list_of_rules(tokens, false); NonnullRefPtrVector rules; @@ -1068,8 +1028,6 @@ Optional Parser::parse_as_declaration() template Optional Parser::parse_a_declaration(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_declaration"); - tokens.skip_whitespace(); auto& token = tokens.peek_token(); @@ -1093,8 +1051,6 @@ RefPtr Parser::parse_as_list_of_declarations( template RefPtr Parser::parse_a_list_of_declarations(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_list_of_declarations"); - auto declarations_and_at_rules = consume_a_list_of_declarations(tokens); Vector properties; @@ -1102,7 +1058,7 @@ RefPtr Parser::parse_a_list_of_declarations(T for (auto& declaration_or_at_rule : declarations_and_at_rules) { if (declaration_or_at_rule.is_at_rule()) { - dbgln("Parser::parse_as_list_of_declarations(): At-rule is not allowed here!"); + dbgln_if(CSS_PARSER_DEBUG, "!!! CSS at-rule is not allowed here!"); continue; } @@ -1130,8 +1086,6 @@ Optional Parser::parse_as_component_value() template Optional Parser::parse_a_component_value(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_component_value"); - tokens.skip_whitespace(); auto& token = tokens.peek_token(); @@ -1160,8 +1114,6 @@ Vector Parser::parse_as_list_of_component_values() template Vector Parser::parse_a_list_of_component_values(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_list_of_component_values"); - Vector rules; for (;;) { @@ -1183,8 +1135,6 @@ Vector> Parser::parse_as_comma_separated_list_of template Vector> Parser::parse_a_comma_separated_list_of_component_values(TokenStream& tokens) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_as_comma_separated_list_of_component_values"); - Vector> lists; lists.append({}); @@ -1243,8 +1193,6 @@ Optional Parser::parse_url_function(ParsingContext const& context, StyleCom RefPtr Parser::convert_to_rule(NonnullRefPtr rule) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::convert_to_rule"); - if (rule->m_type == StyleRule::Type::At) { if (rule->m_name.equals_ignoring_case("import"sv) && !rule->prelude().is_empty()) { @@ -1297,8 +1245,6 @@ RefPtr Parser::convert_to_rule(NonnullRefPtr rule) RefPtr Parser::convert_to_declaration(NonnullRefPtr block) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::convert_to_declaration"); - if (!block->is_curly()) return {}; @@ -1308,8 +1254,6 @@ RefPtr Parser::convert_to_declaration(Nonnull Optional Parser::convert_to_style_property(StyleDeclarationRule& declaration) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::convert_to_style_property"); - auto& property_name = declaration.m_name; auto property_id = property_id_from_string(property_name); @@ -1319,7 +1263,7 @@ Optional Parser::convert_to_style_property(StyleDeclarationRule& } else if (has_ignored_vendor_prefix(property_name)) { return {}; } else if (!property_name.starts_with("-")) { - dbgln("Parser::convert_to_style_property(): Unrecognized property '{}'", property_name); + dbgln("Unrecognized CSS property '{}'", property_name); return {}; } } @@ -1327,7 +1271,7 @@ Optional Parser::convert_to_style_property(StyleDeclarationRule& auto value_token_stream = TokenStream(declaration.m_values); auto value = parse_css_value(property_id, value_token_stream); if (!value) { - dbgln("Parser::convert_to_style_property(): Property '{}' has no value.", property_name); + dbgln("CSS property '{}' has no value.", property_name); return {}; } @@ -2917,8 +2861,6 @@ RefPtr Parser::parse_css_value(ParsingContext const& context, StyleC Optional Parser::parse_a_n_plus_b_pattern(TokenStream& values) { - dbgln_if(CSS_PARSER_DEBUG, "Parser::parse_a_n_plus_b_pattern"); - int a = 0; int b = 0;