beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 00:50:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

LibWeb/CSS: Correct matching of calc() against <number-percentage>
Some checks are pending
CI / Lagom (false, FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, macos-14, macOS, Clang) (push) Waiting to run
Details
CI / Lagom (false, NO_FUZZ, ubuntu-24.04, Linux, GNU) (push) Waiting to run
Details
CI / Lagom (true, NO_FUZZ, ubuntu-24.04, Linux, Clang) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (macos-14, macOS, macOS-universal2) (push) Waiting to run
Details
Package the js repl as a binary artifact / build-and-package (ubuntu-24.04, Linux, Linux-x86_64) (push) Waiting to run
Details
Run test262 and test-wasm / run_and_update_results (push) Waiting to run
Details
Lint Code / lint (push) Waiting to run
Details
Push notes / build (push) Waiting to run
Details

Browse source 
This seems to have vanished from the spec, but in any case, we still
need it. Without this change we erroneously thought that calculations
that match <percentage> did not match <number-percentage>.
This commit is contained in:
Sam Atkins 2024-10-30 17:12:42 +00:00 committed by Alexander Kalenik
parent 797b0d0f43
commit 760943d584
Notes: github-actions[bot] 2024-10-30 19:59:14 +00:00 
Author: https://github.com/AtkinsSJ
Commit: https://github.com/LadybirdBrowser/ladybird/commit/760943d5845
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2061
Reviewed-by: https://github.com/LucasChollet
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Tests/LibWeb/Text/expected/css/hsl-with-number-percentage-calc.txt Normal file
View file

@ -0,0 +1 @@
rgb(88, 101, 242)

13
Tests/LibWeb/Text/input/css/hsl-with-number-percentage-calc.html Normal file
View file

@ -0,0 +1,13 @@
<!doctype html>
<script src="../include.js"></script>
<style>
#target {
background-color: hsl(235 calc(1 * 85.6%) 64.7% / 1);
}
</style>
<div id="target">Hello</div>
<script>
test(() => {
println(getComputedStyle(document.getElementById("target"))["background-color"]);
});
</script>

7
Userland/Libraries/LibWeb/CSS/CSSNumericType.cpp
View file

@ -350,7 +350,7 @@ bool CSSNumericType::matches_percentage() const
auto base_type = static_cast<BaseType>(i);
auto type_exponent = exponent(base_type);
if (base_type == BaseType::Percent) {
if (!type_exponent.has_value() || type_exponent == 0)
if (type_exponent != 1)
return false;
} else {
if (type_exponent.has_value() && type_exponent != 0)
@ -409,8 +409,9 @@ bool CSSNumericType::matches_number_percentage() const
auto base_type = static_cast<BaseType>(i);
auto type_exponent = exponent(base_type);
if (base_type == BaseType::Percent && type_exponent.has_value() && type_exponent != 0 && type_exponent != 1) {
return false;
if (base_type == BaseType::Percent) {
if (type_exponent.has_value() && type_exponent != 0 && type_exponent != 1)
return false;
} else if (type_exponent.has_value() && type_exponent != 0) {
return false;
}