Bug 1396692 - Update wpt expectation. r=xidorn

MozReview-Commit-ID: ANg57HLAqmC

--HG--
extra : rebase_source : 6cef53f9b49d59fa77eca50bfdb5dd3b20da3512

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-010.html.ini

@@ -16,7 +16,9 @@
       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
@@ -29,8 +31,3 @@
 
   [circle(calc(25%*3)) - computed style]
     expected: FAIL
-
-  [circle(calc(10in)) - inline style]
-    expected:
-      if stylo: FAIL
-

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-circle-011.html.ini

@@ -16,7 +16,9 @@
       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
@@ -41,8 +43,3 @@
 
   [circle(at calc((12.5%*6 + 10in) / 4)) - computed style]
     expected: FAIL
-
-  [circle(at calc(10in)) - inline style]
-    expected:
-      if stylo: FAIL
-

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-010.html.ini

@@ -37,7 +37,9 @@
       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
@@ -58,7 +60,9 @@
       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
@@ -101,12 +105,3 @@
 
   [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
-

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-ellipse-011.html.ini

@@ -16,7 +16,9 @@
       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
@@ -58,7 +60,9 @@
       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
@@ -114,12 +118,3 @@
     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
-

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-008.html.ini

@@ -16,13 +16,17 @@
       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:
@@ -45,7 +49,9 @@
       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
@@ -67,8 +73,3 @@
 
   [inset(calc(25%*3) calc(25%*3)) - computed style]
     expected: FAIL
-
-  [inset(calc(10in)) - inline style]
-    expected:
-      if stylo: FAIL
-

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-inset-009.html.ini

@@ -1,7 +1,9 @@
 [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:
@@ -24,13 +26,17 @@
       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:
@@ -53,7 +59,9 @@
       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

testing/web-platform/meta/css/css-shapes-1/shape-outside/values/shape-outside-polygon-006.html.ini

@@ -16,7 +16,9 @@
       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
@@ -37,7 +39,9 @@
       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
@@ -59,12 +63,3 @@
 
   [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
-