diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2018-11-15 11:17:18 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-15 11:17:18 -0500 |
| commit | 13e322183df9836ea1330e64756a7fddf7da972f (patch) | |
| tree | 7089c8dedad5e1173185e96be651917707b57857 /tests/wpt/web-platform-tests/css/css-transforms | |
| parent | 359ec7a76f1eb5d70360ff2b8c49923e9383eca7 (diff) | |
| parent | ff06f1d031be33fd4ea319f821b789ddacacbdf6 (diff) | |
| download | servo-13e322183df9836ea1330e64756a7fddf7da972f.tar.gz servo-13e322183df9836ea1330e64756a7fddf7da972f.zip | |
Auto merge of #22199 - servo-wpt-sync:wpt_update_14-11-2018, r=jdm
Sync WPT with upstream (14-11-2018)
Automated downstream sync of changes from upstream as of 14-11-2018.
[no-wpt-sync]
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22199)
<!-- Reviewable:end -->
Diffstat (limited to 'tests/wpt/web-platform-tests/css/css-transforms')
3 files changed, 13 insertions, 7 deletions
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html b/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html index c82f6be8c5d..63243b5e985 100644 --- a/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html +++ b/tests/wpt/web-platform-tests/css/css-transforms/parsing/rotate-parsing-valid.html @@ -19,14 +19,17 @@ test_valid_value("rotate", "0deg"); test_valid_value("rotate", "100 200 300 400grad"); test_valid_value("rotate", "400grad 100 200 300", "100 200 300 400grad"); -test_valid_value("rotate", "x 400grad", "1 0 0 400grad"); -test_valid_value("rotate", "400grad x", "1 0 0 400grad"); +test_valid_value("rotate", "x 400grad"); +test_valid_value("rotate", "400grad x", "x 400grad"); +test_valid_value("rotate", "1 0 0 400grad", "x 400grad"); -test_valid_value("rotate", "y 400grad", "0 1 0 400grad"); -test_valid_value("rotate", "400grad y", "0 1 0 400grad"); +test_valid_value("rotate", "y 400grad"); +test_valid_value("rotate", "400grad y", "y 400grad"); +test_valid_value("rotate", "0 1 0 400grad", "y 400grad"); -test_valid_value("rotate", "z 400grad", "0 0 1 400grad"); -test_valid_value("rotate", "400grad z", "0 0 1 400grad"); +test_valid_value("rotate", "z 400grad"); +test_valid_value("rotate", "400grad z", "z 400grad"); +test_valid_value("rotate", "0 0 1 400grad", "z 400grad"); </script> </body> </html> diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html b/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html index fe16d545e1f..e000f6a7f57 100644 --- a/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html +++ b/tests/wpt/web-platform-tests/css/css-transforms/parsing/translate-parsing-valid.html @@ -17,9 +17,12 @@ test_valid_value("translate", "none"); test_valid_value("translate", "0px"); test_valid_value("translate", "100%"); +test_valid_value("translate", "100px 0px", "100px"); +test_valid_value("translate", "100px 0%", "100px"); test_valid_value("translate", "100px 200%"); test_valid_value("translate", "100% 200px"); +test_valid_value("translate", "100px 200px 0px"); test_valid_value("translate", "100px 200px 300px"); test_valid_value("translate", "100% 200% 300px"); diff --git a/tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html b/tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html index 71a046f56b0..1ad1bcc4b68 100644 --- a/tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html +++ b/tests/wpt/web-platform-tests/css/css-transforms/transforms-support-calc.html @@ -31,7 +31,7 @@ test(function(){ target.style = 'translate: calc(30px + 20%) calc(-200px + 100%);'; - assert_equals(getComputedStyle(target).translate, 'calc(30px + 20%) calc(-200px + 100%)'); + assert_equals(getComputedStyle(target).translate, 'calc(20% + 30px) calc(100% - 200px)'); }, 'translate supports calc'); test(function(){ |