Bug 1396692 - Update wpt expectation.
MozReview-Commit-ID: ANg57HLAqmC
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-010.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-010.html.ini
@@ -11,26 +11,23 @@
FAIL
[circle(calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[circle(calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[circle(calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[circle(calc(30%)) - computed style]
expected: FAIL
[circle(calc(100%/4)) - computed style]
expected: FAIL
[circle(calc(25%*3)) - computed style]
expected: FAIL
-
- [circle(calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-011.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-011.html.ini
@@ -11,17 +11,19 @@
FAIL
[circle(at calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[circle(at calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[circle(at calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[circle(at calc(10in)) - computed style]
expected: FAIL
[circle(at calc(10in + 20px)) - computed style]
@@ -36,13 +38,8 @@
[circle(at calc(25%*3)) - computed style]
expected: FAIL
[circle(at calc(25%*3 - 10in)) - computed style]
expected: FAIL
[circle(at calc((12.5%*6 + 10in) / 4)) - computed style]
expected: FAIL
-
- [circle(at calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html.ini
@@ -32,17 +32,19 @@
FAIL
[ellipse(farthest-side calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[ellipse(farthest-side calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[ellipse(farthest-side calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[ellipse(calc(10in + 20px) calc(10in + 20px)) - inline style]
expected:
if stylo: PASS
FAIL
@@ -53,17 +55,19 @@
FAIL
[ellipse(calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[ellipse(calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[ellipse(calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[ellipse(calc(10in)) - computed style]
expected: FAIL
[ellipse(calc(10in + 20px)) - computed style]
@@ -96,17 +100,8 @@
[ellipse(calc(30%) calc(30%)) - computed style]
expected: FAIL
[ellipse(calc(100%/4) calc(100%/4)) - computed style]
expected: FAIL
[ellipse(calc(25%*3) calc(25%*3)) - computed style]
expected: FAIL
-
- [ellipse(farthest-side calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
- [ellipse(calc(10in) calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html.ini
@@ -11,17 +11,19 @@
FAIL
[ellipse(at calc(25%*3) 50%) - inline style]
expected:
if stylo: PASS
FAIL
[ellipse(at calc(25%*3 - 10in) 50%) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[ellipse(at calc((12.5%*6 + 10in) / 4) 50%) - inline style]
expected: FAIL
[ellipse(farthest-side at calc(10in) 50%) - inline style]
expected: FAIL
[ellipse(farthest-side at calc(10in + 20px) 50%) - inline style]
@@ -53,17 +55,19 @@
FAIL
[ellipse(closest-side farthest-side at calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[ellipse(closest-side farthest-side at calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[ellipse(closest-side farthest-side at calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[ellipse(at calc(10in) 50%) - computed style]
expected: FAIL
[ellipse(at calc(10in + 20px) 50%) - computed style]
@@ -109,17 +113,8 @@
expected:
if stylo: PASS
FAIL
[ellipse(closest-side farthest-side at calc(10in + 20px) calc(10in + 20px)) - computed style]
expected:
if stylo: PASS
FAIL
-
- [ellipse(at calc(10in) 50%) - inline style]
- expected:
- if stylo: FAIL
-
- [ellipse(closest-side farthest-side at calc(10in) calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-008.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-008.html.ini
@@ -11,23 +11,27 @@
FAIL
[inset(calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[inset(calc(10in) calc(10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(calc(10in + 20px) calc(10in + 20px)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(calc(30%) calc(30%)) - inline style]
expected:
@@ -40,17 +44,19 @@
FAIL
[inset(calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[inset(calc(30%)) - computed style]
expected: FAIL
[inset(calc(100%/4)) - computed style]
@@ -62,13 +68,8 @@
[inset(calc(30%) calc(30%)) - computed style]
expected: FAIL
[inset(calc(100%/4) calc(100%/4)) - computed style]
expected: FAIL
[inset(calc(25%*3) calc(25%*3)) - computed style]
expected: FAIL
-
- [inset(calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-009.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-009.html.ini
@@ -1,12 +1,14 @@
[shape-outside-inset-009.html]
type: testharness
[inset(10px 10px 10px 10px round calc(10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(10px 10px 10px 10px round calc(10in + 20px)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(10px 10px 10px 10px round calc(30%)) - inline style]
expected:
@@ -19,23 +21,27 @@
FAIL
[inset(10px 10px 10px 10px round calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(10px 10px 10px 10px round calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(10px 10px 10px 10px round calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[inset(10px 10px 10px 10px round calc(10in) calc(10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(10px 10px 10px 10px round calc(10in + 20px) calc(10in + 20px)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(10px 10px 10px 10px round calc(30%) calc(30%)) - inline style]
expected:
@@ -48,17 +54,19 @@
FAIL
[inset(10px 10px 10px 10px round calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[inset(10px 10px 10px 10px round calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[inset(10px 10px 10px 10px round calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[inset(10px 10px 10px 10px round calc(30%)) - computed style]
expected: FAIL
[inset(10px 10px 10px 10px round calc(100%/4)) - computed style]
--- a/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html.ini
+++ b/testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html.ini
@@ -11,17 +11,19 @@
FAIL
[polygon(calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[polygon(calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[polygon(calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[polygon(evenodd, calc(10in + 20px) calc(10in + 20px), calc(10in + 20px) calc(10in + 20px)) - inline style]
expected:
if stylo: PASS
FAIL
@@ -32,17 +34,19 @@
FAIL
[polygon(evenodd, calc(25%*3) calc(25%*3), calc(25%*3) calc(25%*3)) - inline style]
expected:
if stylo: PASS
FAIL
[polygon(evenodd, calc(25%*3 - 10in) calc(25%*3 - 10in), calc(25%*3 - 10in) calc(25%*3 - 10in)) - inline style]
- expected: FAIL
+ expected:
+ if stylo: PASS
+ FAIL
[polygon(evenodd, calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4), calc((12.5%*6 + 10in) / 4) calc((12.5%*6 + 10in) / 4)) - inline style]
expected: FAIL
[polygon(calc(30%) calc(30%)) - computed style]
expected: FAIL
[polygon(calc(100%/4) calc(100%/4)) - computed style]
@@ -54,17 +58,8 @@
[polygon(evenodd, calc(30%) calc(30%), calc(30%) calc(30%)) - computed style]
expected: FAIL
[polygon(evenodd, calc(100%/4) calc(100%/4), calc(100%/4) calc(100%/4)) - computed style]
expected: FAIL
[polygon(evenodd, calc(25%*3) calc(25%*3), calc(25%*3) calc(25%*3)) - computed style]
expected: FAIL
-
- [polygon(calc(10in) calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-
- [polygon(evenodd, calc(10in) calc(10in), calc(10in) calc(10in)) - inline style]
- expected:
- if stylo: FAIL
-