diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-03-06 13:48:32 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-03-07 13:42:25 +0100 |
commit | 5f93f1c16135851530a8cd26e630266ba0377dba (patch) | |
tree | 14a7c3ed9110e4c1f8d9711d149925850846facb /Userland | |
parent | e30bfabbcae4a6a6b4d0a29a49087bf26b1b0b83 (diff) | |
download | serenity-5f93f1c16135851530a8cd26e630266ba0377dba.zip |
LibWeb: Introduce and parse CSS Ratio type
This is only used by media-queries, so for now we can skip
adding/parsing a StyleValue for these.
Diffstat (limited to 'Userland')
-rw-r--r-- | Userland/Libraries/LibWeb/CMakeLists.txt | 1 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp | 33 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Parser/Parser.h | 2 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Ratio.cpp | 35 | ||||
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/Ratio.h | 28 |
5 files changed, 99 insertions, 0 deletions
diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index c106bf150d..0862d85a98 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -44,6 +44,7 @@ set(SOURCES CSS/PropertyID.cpp CSS/PropertyID.h CSS/QuirksModeStyleSheetSource.cpp + CSS/Ratio.cpp CSS/Resolution.cpp CSS/ResolvedCSSStyleDeclaration.cpp CSS/Screen.cpp diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp index ae582466ec..e6e171b5fc 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp @@ -2231,6 +2231,39 @@ Optional<Length> Parser::parse_length(StyleComponentValueRule const& component_v return {}; } +Optional<Ratio> Parser::parse_ratio(TokenStream<StyleComponentValueRule>& tokens) +{ + auto position = tokens.position(); + tokens.skip_whitespace(); + + auto error = [&]() -> Optional<Ratio> { + tokens.rewind_to_position(position); + return {}; + }; + + // `<ratio> = <number [0,∞]> [ / <number [0,∞]> ]?` + // FIXME: I think either part is allowed to be calc(), which makes everything complicated. + auto first_number = tokens.next_token(); + if (!first_number.is(Token::Type::Number) || first_number.token().number_value() < 0) + return error(); + + auto position_after_first_number = tokens.position(); + + tokens.skip_whitespace(); + auto solidus = tokens.next_token(); + tokens.skip_whitespace(); + auto second_number = tokens.next_token(); + if (solidus.is(Token::Type::Delim) && solidus.token().delim() == "/" + && second_number.is(Token::Type::Number) && second_number.token().number_value() > 0) { + // Two-value ratio + return Ratio { static_cast<float>(first_number.token().number_value()), static_cast<float>(second_number.token().number_value()) }; + } + + // Single-value ratio + tokens.rewind_to_position(position_after_first_number); + return Ratio { static_cast<float>(first_number.token().number_value()) }; +} + RefPtr<StyleValue> Parser::parse_dimension_value(StyleComponentValueRule const& component_value) { // Numbers with no units can be lengths, in two situations: diff --git a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h index a1ae0c5871..8d4b3527f0 100644 --- a/Userland/Libraries/LibWeb/CSS/Parser/Parser.h +++ b/Userland/Libraries/LibWeb/CSS/Parser/Parser.h @@ -22,6 +22,7 @@ #include <LibWeb/CSS/Parser/StyleFunctionRule.h> #include <LibWeb/CSS/Parser/StyleRule.h> #include <LibWeb/CSS/Parser/Tokenizer.h> +#include <LibWeb/CSS/Ratio.h> #include <LibWeb/CSS/Selector.h> #include <LibWeb/CSS/StyleValue.h> #include <LibWeb/CSS/Supports.h> @@ -243,6 +244,7 @@ private: Optional<Dimension> parse_dimension(StyleComponentValueRule const&); Optional<Color> parse_color(StyleComponentValueRule const&); Optional<Length> parse_length(StyleComponentValueRule const&); + Optional<Ratio> parse_ratio(TokenStream<StyleComponentValueRule>&); enum class AllowedDataUrlType { None, diff --git a/Userland/Libraries/LibWeb/CSS/Ratio.cpp b/Userland/Libraries/LibWeb/CSS/Ratio.cpp new file mode 100644 index 0000000000..f6285dfa45 --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/Ratio.cpp @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include "Ratio.h" +#include <math.h> + +namespace Web::CSS { + +Ratio::Ratio(float first, float second) + : m_first_value(first) + , m_second_value(second) +{ +} + +// https://www.w3.org/TR/css-values-4/#degenerate-ratio +bool Ratio::is_degenerate() const +{ + return !isfinite(m_first_value) || m_first_value == 0 + || !isfinite(m_second_value) || m_second_value == 0; +} + +String Ratio::to_string() const +{ + return String::formatted("{} / {}", m_first_value, m_second_value); +} + +auto Ratio::operator<=>(const Ratio& other) const +{ + return value() - other.value(); +} + +} diff --git a/Userland/Libraries/LibWeb/CSS/Ratio.h b/Userland/Libraries/LibWeb/CSS/Ratio.h new file mode 100644 index 0000000000..724530ba50 --- /dev/null +++ b/Userland/Libraries/LibWeb/CSS/Ratio.h @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org> + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include <AK/String.h> + +namespace Web::CSS { + +// https://www.w3.org/TR/css-values-4/#ratios +class Ratio { +public: + Ratio(float first, float second = 1); + float value() const { return m_first_value / m_second_value; } + bool is_degenerate() const; + + String to_string() const; + auto operator<=>(Ratio const& other) const; + +private: + float m_first_value { 0 }; + float m_second_value { 1 }; +}; + +} |