From 434970f0229262bc9f17669b7d36bf6897e803b1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 26 Mar 2022 14:21:22 +0100 Subject: [PATCH] LibWeb: Remove the totally ad-hoc parse_html_length() All clients of this API have been migrated to HTML dimension value parsing instead. --- .../Libraries/LibWeb/CSS/Parser/Parser.cpp | 23 +------------------ Userland/Libraries/LibWeb/CSS/Parser/Parser.h | 1 - 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index 478c9b78bc..dbbde107db 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, Andreas Kling + * Copyright (c) 2018-2022, Andreas Kling * Copyright (c) 2020-2021, the SerenityOS developers. * Copyright (c) 2021-2022, Sam Atkins * Copyright (c) 2021, Tobias Christiansen @@ -5132,27 +5132,6 @@ RefPtr parse_css_supports(CSS::ParsingContext const& context, Str return parser.parse_as_supports(); } -RefPtr parse_html_length(DOM::Document const& document, StringView string) -{ - if (string.is_null()) - return nullptr; - - auto integer = string.to_int(); - if (integer.has_value()) - return CSS::LengthStyleValue::create(CSS::Length::make_px(integer.value())); - - { - // FIXME: This is both ad-hoc and inefficient (note the String allocation!) - String string_copy(string); - char const* endptr = nullptr; - auto double_value = strtod(string_copy.characters(), const_cast(&endptr)); - if (endptr != string_copy.characters()) - return CSS::LengthStyleValue::create(CSS::Length::make_px(double_value)); - } - - return parse_css_value(CSS::ParsingContext(document), string); -} - // https://html.spec.whatwg.org/multipage/common-microsyntaxes.html#current-dimension-value static RefPtr parse_current_dimension_value(float value, Utf8View input, Utf8View::Iterator position) { diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index dd729d08f5..5d1cca99be 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -358,7 +358,6 @@ RefPtr parse_media_query(CSS::ParsingContext const&, StringView NonnullRefPtrVector parse_media_query_list(CSS::ParsingContext const&, StringView); RefPtr parse_css_supports(CSS::ParsingContext const&, StringView); -RefPtr parse_html_length(DOM::Document const&, StringView); RefPtr parse_dimension_value(StringView); RefPtr parse_nonzero_dimension_value(StringView);