Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CSS Math Functions] Correctly serialize sin/cos/tan functions #15664

Merged
merged 1 commit into from
Jul 8, 2023
Merged

[CSS Math Functions] Correctly serialize sin/cos/tan functions #15664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 92 additions & 34 deletions ...utTests/imported/w3c/web-platform-tests/css/css-values/sin-cos-tan-serialize-expected.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,100 @@

FAIL 'cos(0)' as a specified value should serialize as 'calc(1)'. assert_equals: 'cos(0)' and 'calc(1)' should serialize the same in specified values. expected "calc(1)" but got "cos(0)"
FAIL 'scale(cos(0))' as a specified value should serialize as 'scale(calc(1))'. assert_equals: 'scale(cos(0))' and 'scale(calc(1))' should serialize the same in specified values. expected "scale(calc(1))" but got "scale(cos(0))"
PASS 'cos(0)' as a computed value should serialize as '1'.
PASS 'scale(cos(0))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.
FAIL 'sin(0)' as a specified value should serialize as 'calc(0)'. assert_equals: 'sin(0)' and 'calc(0)' should serialize the same in specified values. expected "calc(0)" but got "sin(0)"
FAIL 'scale(sin(0))' as a specified value should serialize as 'scale(calc(0))'. assert_equals: 'scale(sin(0))' and 'scale(calc(0))' should serialize the same in specified values. expected "scale(calc(0))" but got "scale(sin(0))"
PASS 'sin(0)' as a computed value should serialize as '0'.
PASS 'scale(sin(0))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'.
FAIL 'tan(0)' as a specified value should serialize as 'calc(0)'. assert_equals: 'tan(0)' and 'calc(0)' should serialize the same in specified values. expected "calc(0)" but got "tan(0)"
FAIL 'scale(tan(0))' as a specified value should serialize as 'scale(calc(0))'. assert_equals: 'scale(tan(0))' and 'scale(calc(0))' should serialize the same in specified values. expected "scale(calc(0))" but got "scale(tan(0))"
PASS 'tan(0)' as a computed value should serialize as '0'.
PASS 'scale(tan(0))' as a computed value should serialize as 'matrix(0, 0, 0, 0, 0, 0)'.
PASS 'calc(sin(0) + cos(0) + tan(0))' as a specified value should serialize as 'calc(1)'.
PASS 'scale(calc(sin(0) + cos(0) + tan(0)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'calc(sin(0) + cos(0) + tan(0))' as a computed value should serialize as '1'.
PASS 'scale(calc(sin(0) + cos(0) + tan(0)))' as a computed value should serialize as 'matrix(1, 0, 0, 1, 0, 0)'.
PASS 'calc(sin(0) + 0.5)' as a specified value should serialize as 'calc(0.5)'.
PASS 'scale(cos(0))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(cos(0)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(sin(0))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(sin(0)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(tan(0))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(tan(0)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(sin(0) + 0.5))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'calc(sin(0) + 0.5)' as a computed value should serialize as '0.5'.
PASS 'scale(calc(sin(0) + 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.
PASS 'calc(cos(0) + 0.5)' as a specified value should serialize as 'calc(1.5)'.
PASS 'scale(calc(calc(sin(0) + 0.5)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(0) + cos(0) + tan(0)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(calc(sin(0) + cos(0) + tan(0))))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(cos(0) + 0.5))' as a specified value should serialize as 'scale(calc(1.5))'.
FAIL 'calc(cos(0) + 0.5)' as a computed value should serialize as '1.5'. assert_equals: '1.5' should round-trip exactly in computed values. expected "1.5" but got "1"
PASS 'scale(calc(cos(0) + 0.5))' as a computed value should serialize as 'matrix(1.5, 0, 0, 1.5, 0, 0)'.
PASS 'calc(tan(0) + 0.5)' as a specified value should serialize as 'calc(0.5)'.
PASS 'scale(calc(calc(cos(0) + 0.5)))' as a specified value should serialize as 'scale(calc(1.5))'.
PASS 'scale(calc(tan(0) + 0.5))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'calc(tan(0) + 0.5)' as a computed value should serialize as '0.5'.
PASS 'scale(calc(tan(0) + 0.5))' as a computed value should serialize as 'matrix(0.5, 0, 0, 0.5, 0, 0)'.
PASS 'calc(sin(infinity))' as a specified value should serialize as 'calc(NaN)'.
PASS 'scale(calc(calc(tan(0) + 0.5)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(0deg))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(cos(0deg)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(sin(0deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(sin(0deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(tan(0deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(tan(0deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(sin(30deg))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(30deg)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(sin(0.523599))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(0.523599)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(sin(0.523599rad))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(0.523599rad)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(sin(33.333333grad))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(33.333333grad)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(sin(0.08333333turn))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(sin(0.08333333turn)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(60deg))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(cos(60deg)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(66.66666666grad))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(cos(66.66666666grad)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(1.047197551))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(cos(1.047197551)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(1.047197551rad))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(cos(1.047197551rad)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(cos(0.16666666666turn))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(calc(cos(0.16666666666turn)))' as a specified value should serialize as 'scale(calc(0.5))'.
PASS 'scale(tan(45deg))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(tan(45deg)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(tan(50grad))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(tan(50grad)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(tan(0.78539816))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(tan(0.78539816)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(tan(0.78539816rad))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(tan(0.78539816rad)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(tan(0.125turn))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(tan(0.125turn)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(tan(90deg))' as a specified value should serialize as 'scale(calc(infinity))'.
PASS 'scale(calc(tan(90deg)))' as a specified value should serialize as 'scale(calc(infinity))'.
PASS 'scale(tan(-90deg))' as a specified value should serialize as 'scale(calc(-infinity))'.
PASS 'scale(calc(tan(-90deg)))' as a specified value should serialize as 'scale(calc(-infinity))'.
PASS 'scale(sin(180deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(sin(180deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(cos(180deg))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(calc(cos(180deg)))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(tan(180deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(tan(180deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(sin(270deg))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(calc(sin(270deg)))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(cos(270deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(cos(270deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(tan(270deg))' as a specified value should serialize as 'scale(calc(-infinity))'.
PASS 'scale(calc(tan(270deg)))' as a specified value should serialize as 'scale(calc(-infinity))'.
PASS 'scale(sin(-180deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(sin(-180deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(cos(-180deg))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(calc(cos(-180deg)))' as a specified value should serialize as 'scale(calc(-1))'.
PASS 'scale(tan(-180deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(tan(-180deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(sin(-270deg))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(calc(sin(-270deg)))' as a specified value should serialize as 'scale(calc(1))'.
PASS 'scale(cos(-270deg))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(calc(cos(-270deg)))' as a specified value should serialize as 'scale(calc(0))'.
PASS 'scale(tan(-270deg))' as a specified value should serialize as 'scale(calc(infinity))'.
PASS 'scale(calc(tan(-270deg)))' as a specified value should serialize as 'scale(calc(infinity))'.
PASS 'scale(calc(sin(30deg) + cos(60deg) + tan(45deg)))' as a specified value should serialize as 'scale(calc(2))'.
PASS 'scale(calc(calc(sin(30deg) + cos(60deg) + tan(45deg))))' as a specified value should serialize as 'scale(calc(2))'.
PASS 'scale(calc(sin(infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
FAIL 'calc(sin(infinity))' as a computed value should serialize as 'NaN'. assert_equals: 'NaN' should round-trip exactly in computed values. expected "NaN" but got "1"
FAIL 'scale(calc(sin(infinity)))' as a computed value should serialize as 'matrix(NaN, 0, 0, NaN, 0, 0)'. assert_equals: 'matrix(NaN, 0, 0, NaN, 0, 0)' should round-trip exactly in computed values. expected "matrix(NaN, 0, 0, NaN, 0, 0)" but got "none"
PASS 'calc(cos(infinity))' as a specified value should serialize as 'calc(NaN)'.
PASS 'scale(calc(calc(sin(infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(cos(infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
FAIL 'calc(cos(infinity))' as a computed value should serialize as 'NaN'. assert_equals: 'NaN' should round-trip exactly in computed values. expected "NaN" but got "1"
FAIL 'scale(calc(cos(infinity)))' as a computed value should serialize as 'matrix(NaN, 0, 0, NaN, 0, 0)'. assert_equals: 'matrix(NaN, 0, 0, NaN, 0, 0)' should round-trip exactly in computed values. expected "matrix(NaN, 0, 0, NaN, 0, 0)" but got "none"
PASS 'calc(tan(infinity))' as a specified value should serialize as 'calc(NaN)'.
PASS 'scale(calc(calc(cos(infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(tan(infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
FAIL 'calc(tan(infinity))' as a computed value should serialize as 'NaN'. assert_equals: 'NaN' should round-trip exactly in computed values. expected "NaN" but got "1"
FAIL 'scale(calc(tan(infinity)))' as a computed value should serialize as 'matrix(NaN, 0, 0, NaN, 0, 0)'. assert_equals: 'matrix(NaN, 0, 0, NaN, 0, 0)' should round-trip exactly in computed values. expected "matrix(NaN, 0, 0, NaN, 0, 0)" but got "none"
PASS 'scale(calc(calc(tan(infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(sin(-infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(sin(-infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(cos(-infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(cos(-infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(tan(-infinity)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(tan(-infinity))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(sin(NaN)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(sin(NaN))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(cos(NaN)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(cos(NaN))))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(tan(NaN)))' as a specified value should serialize as 'scale(calc(NaN))'.
PASS 'scale(calc(calc(tan(NaN))))' as a specified value should serialize as 'scale(calc(NaN))'.

108 changes: 60 additions & 48 deletions LayoutTests/imported/w3c/web-platform-tests/css/css-values/sin-cos-tan-serialize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,73 @@
<!DOCTYPE html>
<link rel="help" href="https://drafts.csswg.org/css-values-4/#comp-func">
<link rel="help" href="https://drafts.csswg.org/css-values-4/#trig-funcs">
<link rel="help" href="https://drafts.csswg.org/css-values-4/#numbers">
<link rel="help" href="https://drafts.csswg.org/css-values-4/#calc-serialize">
<link rel="author" title="Apple Inc">
<link rel="author" title="Seokho Song" href="seokho@chromium.org">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script src="../support/serialize-testcommon.js"></script>
<div id=target></div>
<script>
function test_serialization(t,s,c) {
test_specified_serialization('opacity', t, s);
test_specified_serialization('transform', `scale(${t})`, `scale(calc(${c}))`);
test_computed_serialization('opacity', t, c);
test_computed_serialization('transform', `scale(${t})`, `matrix(${c}, 0, 0, ${c}, 0, 0)`);
function test_serialization(specified, expected, {prop="transform"}={}) {
test_specified_serialization(prop, `scale(${specified})`, `scale(${expected})`)
}
//TEST CASE | EXPECTED
var test_map = {
"cos(0)" :"calc(1)",
"sin(0)" :"calc(0)",
"tan(0)" :"calc(0)",
"calc(sin(0) + 0.5)" :"calc(0.5)",
"calc(sin(0) + cos(0) + tan(0))" :"calc(1)",
"calc(cos(0) + 0.5)" :"calc(1.5)",
"calc(tan(0) + 0.5)" :"calc(0.5)",
"cos(0deg)" :"calc(1)",
"sin(0deg)" :"calc(0)",
"tan(0deg)" :"calc(0)",
"sin(30deg)" :"calc(0.5)",
"sin(0.523599)" :"calc(0.5)",
"sin(0.523599rad)" :"calc(0.5)",
"sin(33.333333grad)" :"calc(0.5)",
"sin(0.08333333turn)" :"calc(0.5)",
"cos(60deg)" :"calc(0.5)",
"cos(66.66666666grad)" :"calc(0.5)",
"cos(1.047197551)" :"calc(0.5)",
"cos(1.047197551rad)" :"calc(0.5)",
"cos(0.16666666666turn)" :"calc(0.5)",
"tan(45deg)" :"calc(1)",
"tan(50grad)" :"calc(1)",
"tan(0.78539816)" :"calc(1)",
"tan(0.78539816rad)" :"calc(1)",
"tan(0.125turn)" :"calc(1)",
"tan(90deg)" :"calc(infinity)",
"tan(-90deg)" :"calc(-infinity)",
"sin(180deg)" :"calc(0)",
"cos(180deg)" :"calc(-1)",
"tan(180deg)" :"calc(0)",
"sin(270deg)" :"calc(-1)",
"cos(270deg)" :"calc(0)",
"tan(270deg)" :"calc(-infinity)",
"sin(-180deg)" :"calc(0)",
"cos(-180deg)" :"calc(-1)",
"tan(-180deg)" :"calc(0)",
"sin(-270deg)" :"calc(1)",
"cos(-270deg)" :"calc(0)",
"tan(-270deg)" :"calc(infinity)",
"calc(sin(30deg) + cos(60deg) + tan(45deg))" :"calc(2)",
"calc(sin(infinity))" :"calc(NaN)",
"calc(cos(infinity))" :"calc(NaN)",
"calc(tan(infinity))" :"calc(NaN)",
"calc(sin(-infinity))" :"calc(NaN)",
"calc(cos(-infinity))" :"calc(NaN)",
"calc(tan(-infinity))" :"calc(NaN)",
"calc(sin(NaN))" :"calc(NaN)",
"calc(cos(NaN))" :"calc(NaN)",
"calc(tan(NaN))" :"calc(NaN)",
};

test_serialization(
'cos(0)',
'calc(1)',
'1');
test_serialization(
'sin(0)',
'calc(0)',
'0');
test_serialization(
'tan(0)',
'calc(0)',
'0');

test_serialization(
'calc(sin(0) + cos(0) + tan(0))',
'calc(1)',
'1');

test_serialization(
'calc(sin(0) + 0.5)',
'calc(0.5)',
'0.5');
test_serialization(
'calc(cos(0) + 0.5)',
'calc(1.5)',
'1.5');
test_serialization(
'calc(tan(0) + 0.5)',
'calc(0.5)',
'0.5');
for (var exp in test_map) {
test_serialization(exp, test_map[exp]);
test_serialization(`calc(${exp})`, test_map[exp]);
}

test_serialization(
'calc(sin(infinity))',
'calc(NaN)',
'NaN');
test_serialization(
'calc(cos(infinity))',
'calc(NaN)',
'NaN');
test_serialization(
'calc(tan(infinity))',
'calc(NaN)',
'NaN');
</script>
12 changes: 11 additions & 1 deletion Source/WebCore/css/calc/CSSCalcOperationNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include "Logging.h"
#include <wtf/Algorithms.h>
#include <wtf/ListHashSet.h>
#include <wtf/MathExtras.h>
#include <wtf/text/TextStream.h>

namespace WebCore {
Expand Down Expand Up @@ -1369,7 +1370,16 @@ double CSSCalcOperationNode::evaluateOperator(CalcOperator op, const Vector<doub
case CalcOperator::Tan: {
if (children.size() != 1)
return std::numeric_limits<double>::quiet_NaN();
return std::tan(children[0]);
double x = std::fmod(children[0], piDouble * 2);
nt1m marked this conversation as resolved.
Show resolved Hide resolved
// std::fmod can return negative values.
x = x < 0 ? piDouble * 2 + x : x;
nt1m marked this conversation as resolved.
Show resolved Hide resolved
ASSERT(!(x < 0));
ASSERT(!(x > piDouble * 2));
if (x == piOverTwoDouble)
nt1m marked this conversation as resolved.
Show resolved Hide resolved
return std::numeric_limits<double>::infinity();
if (x == 3 * piOverTwoDouble)
return -std::numeric_limits<double>::infinity();
return std::tan(x);
}
case CalcOperator::Log: {
if (children.size() != 1 && children.size() != 2)
Expand Down
Loading