diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2022-03-02 15:58:16 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2022-03-02 17:39:57 +0100 |
commit | 973f3c3642446022e7baa4b566555e9c09540214 (patch) | |
tree | 7a238815a8bd51e40d6cee75706ab690da3c4d2b /Userland/Libraries | |
parent | 6a4978764f502c6c56ad9c7d9a09a58e62740cf0 (diff) | |
download | serenity-973f3c3642446022e7baa4b566555e9c09540214.zip |
LibWeb: Correct handling of negative step values in nth-foo() selectors
This should be 1% on Acid3. :^)
Added the `-5n+3` case to all `nth-of-whatever()` selector test pages,
so we can easily check that it works.
Diffstat (limited to 'Userland/Libraries')
-rw-r--r-- | Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp b/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp index 52b4965ab9..14f4776149 100644 --- a/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp +++ b/Userland/Libraries/LibWeb/CSS/SelectorEngine.cpp @@ -179,13 +179,21 @@ static inline bool matches_pseudo_class(CSS::Selector::SimpleSelector::PseudoCla VERIFY_NOT_REACHED(); } - if (step_size < 0) { - // When "step_size" is negative, selector represents first "offset" elements in document tree. + // When "step_size == -1", selector represents first "offset" elements in document tree. + if (step_size == -1) return !(offset <= 0 || index > offset); - } else if (step_size == 1) { - // When "step_size == 1", selector represents last "offset" elements in document tree. + + // When "step_size == 1", selector represents last "offset" elements in document tree. + if (step_size == 1) return !(offset < 0 || index < offset); - } + + // When "step_size == 0", selector picks only the "offset" element. + if (step_size == 0) + return index == offset; + + // If both are negative, nothing can match. + if (step_size < 0 && offset < 0) + return false; // Like "a % b", but handles negative integers correctly. auto const canonical_modulo = [](int a, int b) -> int { @@ -196,15 +204,12 @@ static inline bool matches_pseudo_class(CSS::Selector::SimpleSelector::PseudoCla return c; }; - if (step_size == 0) { - // Avoid divide by zero. - if (index != offset) { - return false; - } - } else if (canonical_modulo(index - offset, step_size) != 0) { - return false; - } - return true; + // When "step_size < 0", we start at "offset" and count backwards. + if (step_size < 0) + return index <= offset && canonical_modulo(index - offset, -step_size) == 0; + + // Otherwise, we start at "offset" and count forwards. + return index >= offset && canonical_modulo(index - offset, step_size) == 0; } return false; |