Backed out 201 changesets (bug 1530837, bug 1529206, bug 1528232, bug 1530834, bug 1528032, bug 1530831, bug 1528237, bug 1529242, bug 1529821, bug 1530839, bug 1509034, bug 1527222, bug 1528705, bug 1530812, bug 1528266, bug 1528274, bug 1529038, bug 1464538, bug 1531331, bug 1531337, bug 1529734, bug 1528888, bug 1528887, bug 1527719, bug 1528711, bug 1527514, bug 1527981, bug 1528927, bug 1528949, bug 1531007, bug 1528736, bug 1531372, bug 1528732, bug 1530825, bug 1529061, bug 1528204, bug 1527487, bug 1528741, bug 1527961, bug 1527353, bug 1529208, bug 1527643, bug 1529244, bug 1526836, bug 1529740, bug 1527540, bug 1486514, bug 1526863, bug 1528719, bug 1529749, bug 1528954, bug 1528721, bug 1527560, bug 1526275, bug 1528894, bug 1527212, bug 1531341, bug 1529756, bug 1527584, bug 1527634, bug 1528728, bug 1527474, bug 1529438, bug 1528919, bug 1531365, bug 1528853, bug 1528726, bug 1529430, bug 1529341, bug 1529263, bug 1529459, bug 1528058, bug 1528722, bug 1528746, bug 1528211, bug 1529092, bug 1528152, bug 1529059, bug 1529229, bug 1529752, bug 1529052, bug 1529712, bug 1529055, bug 1529717, bug 1528700, bug 1528862, bug 1526647, bug 1529814, bug 1528868, bug 1529810, bug 1531069, bug 1527478, bug 1529462, bug 1528716, bug 1528828, bug 1531256, bug 1529426, bug 1531357, bug 1531064, bug 1529156, bug 1529724, bug 1529726, bug 1527483, bug 1527638, bug 1526801, bug 1528229, bug 1530852, bug 1529080, bug 1528109, bug 1528029, bug 1529435, bug 1527669, bug 1526881, bug 1529315, bug 1528023, bug 1527661, bug 1529046, bug 1526260, bug 1527640, bug 1531345, bug 1531229, bug 1527331, bug 1529807, bug 1532580, bug 1529806, bug 1529818, bug 1529800, bug 1530855, bug 1527506, bug 1528702, bug 1527548, bug 1493024, bug 1530850, bug 1529796, bug 1529797, bug 1528709, bug 1526693, bug 1526694, bug 1530858, bug 1528830, bug 1513857) for spidermonkey bustages. CLOSED TREE

Backed out changeset 95f1a7ff5760 (bug 1532580)
Backed out changeset ad53fdccd298 (bug 1532580)
Backed out changeset 8e485b71ccc1 (bug 1531372)
Backed out changeset a05f7a542606 (bug 1531365)
Backed out changeset e28093d1fc65 (bug 1527584)
Backed out changeset 5c6bfad36ca0 (bug 1527584)
Backed out changeset 0d8c97a32de3 (bug 1531229)
Backed out changeset bdbfea412122 (bug 1531256)
Backed out changeset 91b75e0e8324 (bug 1531256)
Backed out changeset 7b01e9d570db (bug 1531357)
Backed out changeset 3f555f93c070 (bug 1531357)
Backed out changeset ca9d69428070 (bug 1531069)
Backed out changeset 4c96cc5997e6 (bug 1531064)
Backed out changeset 899598b6d7ff (bug 1529462)
Backed out changeset 5eca1c95182a (bug 1529462)
Backed out changeset 467ad65e9ecf (bug 1531007)
Backed out changeset bd1da129790f (bug 1531007)
Backed out changeset cb8f38a459ab (bug 1531345)
Backed out changeset 1d08bdabd996 (bug 1531341)
Backed out changeset 61c94b97adf1 (bug 1531337)
Backed out changeset d8bf259eaff2 (bug 1531331)
Backed out changeset b8250121c2bc (bug 1530858)
Backed out changeset 1f293875c401 (bug 1529438)
Backed out changeset 9d1af899260a (bug 1530855)
Backed out changeset 6b60020595e0 (bug 1493024)
Backed out changeset fe1a2cb779e0 (bug 1530852)
Backed out changeset bd463e2be011 (bug 1530850)
Backed out changeset 83c0823bb8e1 (bug 1528888)
Backed out changeset d6548d68aad4 (bug 1530839)
Backed out changeset f1a2f7d7615b (bug 1530837)
Backed out changeset 975fbec5a080 (bug 1530834)
Backed out changeset 869bf8eca7ef (bug 1530831)
Backed out changeset 375113eacb17 (bug 1529080)
Backed out changeset 17b00ba4a020 (bug 1529080)
Backed out changeset 219767918106 (bug 1530825)
Backed out changeset 71e7983951a6 (bug 1526801)
Backed out changeset fff147f5ba18 (bug 1526801)
Backed out changeset 2f41234f6509 (bug 1528954)
Backed out changeset 4e667891d308 (bug 1528949)
Backed out changeset 5ca434eafe2f (bug 1530812)
Backed out changeset d23a9f7c490e (bug 1530812)
Backed out changeset ed42aeed054b (bug 1529263)
Backed out changeset 899099cb0784 (bug 1529263)
Backed out changeset 164f6bebaebc (bug 1529208)
Backed out changeset 573fa1dbbb4d (bug 1529821)
Backed out changeset c6ad6c137153 (bug 1529459)
Backed out changeset 6caf4fe5691d (bug 1529459)
Backed out changeset ee028b57d613 (bug 1529818)
Backed out changeset 33633cf10c0d (bug 1529814)
Backed out changeset 869b8f43a793 (bug 1529092)
Backed out changeset 51f209d730ca (bug 1529092)
Backed out changeset 8209d757949e (bug 1527961)
Backed out changeset f7ad412343b9 (bug 1527961)
Backed out changeset 2c7bf50257af (bug 1529810)
Backed out changeset 62fe727988a6 (bug 1529810)
Backed out changeset 8592c05fe031 (bug 1526275)
Backed out changeset 1a3fb0f644ae (bug 1529807)
Backed out changeset 32f87ee369cb (bug 1529806)
Backed out changeset 1c117fbc850f (bug 1529800)
Backed out changeset f5582e70c239 (bug 1526693)
Backed out changeset 421b2d615568 (bug 1526693)
Backed out changeset 6b7cb75d72aa (bug 1529797)
Backed out changeset 2f7275c284b1 (bug 1529797)
Backed out changeset d6a61db63718 (bug 1529796)
Backed out changeset b9c6ed34a214 (bug 1529796)
Backed out changeset 7a38369a17d3 (bug 1529435)
Backed out changeset 88bd6cc607e2 (bug 1529435)
Backed out changeset d700b6928f43 (bug 1529430)
Backed out changeset 81d0e91ab507 (bug 1529430)
Backed out changeset d252a7037801 (bug 1529229)
Backed out changeset 253adcb96f41 (bug 1529229)
Backed out changeset 719455274599 (bug 1529206)
Backed out changeset 37d25235012d (bug 1529206)
Backed out changeset 373ccecf93ea (bug 1528274)
Backed out changeset fa55f010bd71 (bug 1528274)
Backed out changeset 9de615ccb5c5 (bug 1529156)
Backed out changeset b871b38ec2b3 (bug 1529156)
Backed out changeset f419b8ba3747 (bug 1529426)
Backed out changeset 1d2059a2cf36 (bug 1529244)
Backed out changeset 5de598a7923d (bug 1529315)
Backed out changeset 629ad93a6738 (bug 1529315)
Backed out changeset cf68befd3506 (bug 1529341)
Backed out changeset 3f9c54ed7d2c (bug 1526881)
Backed out changeset c9867062b58d (bug 1526863)
Backed out changeset d3dcbaa53bac (bug 1526863)
Backed out changeset 05ff2e535c6e (bug 1528919)
Backed out changeset df087069273b (bug 1528919)
Backed out changeset 43debb14a004 (bug 1529242)
Backed out changeset 71768e55e777 (bug 1528828)
Backed out changeset 7d54ecab8dc1 (bug 1528828)
Backed out changeset 263580f65aea (bug 1528830)
Backed out changeset 65f41dd56207 (bug 1528927)
Backed out changeset 8080b1f6eef2 (bug 1528894)
Backed out changeset e7d92d3120c4 (bug 1528894)
Backed out changeset f7d636225ed1 (bug 1528887)
Backed out changeset 577ea54d1b0c (bug 1528868)
Backed out changeset b3bae9f26b98 (bug 1528862)
Backed out changeset 3e265c28d845 (bug 1528853)
Backed out changeset 6dee1f08de48 (bug 1528853)
Backed out changeset 0ce1a5521d6f (bug 1526694)
Backed out changeset 64cc60d52a04 (bug 1526694)
Backed out changeset a5181637d09e (bug 1486514)
Backed out changeset 2cabd13e237f (bug 1486514)
Backed out changeset 9fd49ca281f0 (bug 1528152)
Backed out changeset 24a07018f8a8 (bug 1529756)
Backed out changeset fbf69465f685 (bug 1529752)
Backed out changeset 0b5d77924a13 (bug 1529752)
Backed out changeset b2ffdd7ebfe7 (bug 1529749)
Backed out changeset d4188fabe555 (bug 1529740)
Backed out changeset 99fe9246e9a3 (bug 1529734)
Backed out changeset e860533a4743 (bug 1529734)
Backed out changeset 3d06a920925d (bug 1529726)
Backed out changeset 22f687c325e8 (bug 1529724)
Backed out changeset 105008f9f601 (bug 1529717)
Backed out changeset 5724299ed798 (bug 1529717)
Backed out changeset 788727cccd4f (bug 1529712)
Backed out changeset 348216552124 (bug 1529712)
Backed out changeset 106ac73457aa (bug 1529061)
Backed out changeset 05a81cf22d1e (bug 1529061)
Backed out changeset 07c3ea987b01 (bug 1529059)
Backed out changeset ceb6af0d7338 (bug 1529055)
Backed out changeset 40338ef0c5ae (bug 1529055)
Backed out changeset 97385559862c (bug 1529052)
Backed out changeset 4fe6634c3cea (bug 1529046)
Backed out changeset da708ab85cc6 (bug 1529038)
Backed out changeset 18139e69e3c5 (bug 1528266)
Backed out changeset e5f7bd9d93a4 (bug 1527719)
Backed out changeset 1fb1b5a75a79 (bug 1527719)
Backed out changeset 58ff2725e6a5 (bug 1527661)
Backed out changeset 16b6e709d409 (bug 1527661)
Backed out changeset e23c3c3fe9cd (bug 1528746)
Backed out changeset e8fd59f2739a (bug 1528746)
Backed out changeset 5cbc3a522b49 (bug 1528741)
Backed out changeset 66fb4cc72692 (bug 1464538)
Backed out changeset 2e1f864ca504 (bug 1464538)
Backed out changeset ed2e428a7fb7 (bug 1528211)
Backed out changeset 32c8219664b6 (bug 1528736)
Backed out changeset d6a7755ddcbb (bug 1528732)
Backed out changeset 056f30752f2d (bug 1528728)
Backed out changeset ac00cd4c7abc (bug 1528726)
Backed out changeset bcd8267fa113 (bug 1528726)
Backed out changeset 51f0cd0c1621 (bug 1528722)
Backed out changeset 165c390054b2 (bug 1528721)
Backed out changeset 772109738241 (bug 1528719)
Backed out changeset a73350397302 (bug 1528716)
Backed out changeset 84b7e38be0cc (bug 1513857)
Backed out changeset e63c62898033 (bug 1528711)
Backed out changeset a7ee2a24d898 (bug 1527353)
Backed out changeset 5fb707e280c1 (bug 1509034)
Backed out changeset be42c83c6e97 (bug 1509034)
Backed out changeset 2eb522ceb6e1 (bug 1528709)
Backed out changeset 822ff0ac5f39 (bug 1527981)
Backed out changeset 3fb86165ce50 (bug 1527981)
Backed out changeset 7f5ce8587ad9 (bug 1528705)
Backed out changeset b571112619c2 (bug 1528702)
Backed out changeset 8b3668ee0579 (bug 1528702)
Backed out changeset 0562ba7637c2 (bug 1528058)
Backed out changeset 9e73b2eb508f (bug 1528700)
Backed out changeset d3e10f10f4c2 (bug 1528032)
Backed out changeset 629c2a5b9013 (bug 1528029)
Backed out changeset 78d3aefc4418 (bug 1528023)
Backed out changeset 48f705e0ae7e (bug 1528237)
Backed out changeset f6690a972633 (bug 1528237)
Backed out changeset f62003f22992 (bug 1528232)
Backed out changeset a8be7c66cb41 (bug 1528229)
Backed out changeset f4fa3dd608c7 (bug 1528229)
Backed out changeset 181a97408a30 (bug 1528204)
Backed out changeset f60df1fe019b (bug 1528204)
Backed out changeset e45e2443ffae (bug 1526260)
Backed out changeset 013ad346966b (bug 1526260)
Backed out changeset 1c5a3f8b212a (bug 1527222)
Backed out changeset ec1f4ffa35d1 (bug 1527222)
Backed out changeset 89dc1513582b (bug 1527669)
Backed out changeset 3bd6059a1b64 (bug 1528109)
Backed out changeset c3299b5db5d8 (bug 1527560)
Backed out changeset 01df42e8dca9 (bug 1527560)
Backed out changeset 9a1e1d9bc686 (bug 1526836)
Backed out changeset c08164922aaf (bug 1526836)
Backed out changeset 1a78f6d88afa (bug 1527540)
Backed out changeset b781b88b53d1 (bug 1527643)
Backed out changeset 793206aecd5e (bug 1527643)
Backed out changeset 6b5a45ed3837 (bug 1527548)
Backed out changeset 5d939be0e4cd (bug 1527640)
Backed out changeset aef452a8ebca (bug 1527640)
Backed out changeset 52755e035f39 (bug 1527638)
Backed out changeset b9735af59094 (bug 1527638)
Backed out changeset 0883b91b6367 (bug 1527634)
Backed out changeset 98dd738ff942 (bug 1527514)
Backed out changeset aa57afa41078 (bug 1527506)
Backed out changeset 61dabecba34c (bug 1527506)
Backed out changeset feaa22c216e3 (bug 1526647)
Backed out changeset c746aaf82c65 (bug 1527487)
Backed out changeset 07cdbdb2c608 (bug 1527487)
Backed out changeset 8b006c4103ff (bug 1527483)
Backed out changeset d781f4856028 (bug 1527483)
Backed out changeset 9ef5380f4ea9 (bug 1527478)
Backed out changeset ede03586f13b (bug 1527478)
Backed out changeset 9ca222b6a740 (bug 1527331)
Backed out changeset 3b96582a3422 (bug 1527474)
Backed out changeset 403d814ff267 (bug 1527474)
Backed out changeset 353a9e562d20 (bug 1527212)

--HG--
rename : testing/web-platform/tests/css/css-images/reference/100x100-blue-green.html => testing/web-platform/tests/css/css-images/support/100x100-blue-green.html
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-block.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-block.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1-generic.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1-generic.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-1.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-1.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2-generic.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2-generic.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-2.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-2.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-3.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-3.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-5.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-5.xml
rename : testing/web-platform/tests/css/css-namespaces/reference/ref-lime-6.xml => testing/web-platform/tests/css/css-namespaces/reftest/ref-lime-6.xml
rename : testing/web-platform/tests/css/css-transforms/reference/transform-3d-rotateY-stair-above-ref-001.xht => testing/web-platform/tests/css/css-transforms/reftest/transform-3d-rotateY-stair-above-ref-001.xht
rename : testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-001-ref.xht => testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-001-ref.xht
rename : testing/web-platform/tests/css/css-transforms/reference/transform-applies-to-002-ref.xht => testing/web-platform/tests/css/css-transforms/reftest/transform-applies-to-002-ref.xht
rename : testing/web-platform/tests/css/css-transforms/reference/transform-origin-01-ref.html => testing/web-platform/tests/css/css-transforms/reftest/transform-origin-01-ref.html
rename : testing/web-platform/tests/css/css-transforms/transform-box/reference/greensquare200x200.html => testing/web-platform/tests/css/css-transforms/transform-box/support/greensquare200x200.html
rename : testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-lr-002-ref.xht => testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-lr-002-ref.xht
rename : testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-001-ref.xht => testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-001-ref.xht
rename : testing/web-platform/tests/css/css-writing-modes/reference/writing-mode-vertical-rl-002-ref.xht => testing/web-platform/tests/css/css-writing-modes/reftest/writing-mode-vertical-rl-002-ref.xht
rename : testing/web-platform/tests/orientation-event/devicemotionevent-init.https.html => testing/web-platform/tests/orientation-event/devicemotionevent-init.html
rename : testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.https.html => testing/web-platform/tests/orientation-event/deviceorientationabsoluteevent.html
rename : testing/web-platform/tests/orientation-event/deviceorientationevent-init.https.html => testing/web-platform/tests/orientation-event/deviceorientationevent-init.html
rename : testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.https.html => testing/web-platform/tests/orientation-event/ondeviceorientationabsolute.html
rename : testing/web-platform/tests/svg/embedded/reference/green-rect-100x100.svg => testing/web-platform/tests/svg/embedded/support/green-rect-100x100.svg
rename : testing/web-platform/tests/svg/shapes/reftests/reference/empty.svg => testing/web-platform/tests/svg/shapes/reftests/support/empty.svg

testing/marionette/reftest.js

@@ -128,7 +128,7 @@ reftest.Runner = class {
     let reftestWin = this.parentWindow.open(
         "chrome://marionette/content/reftest.xul",
         "reftest",
-        `chrome,height=${height},width=${width}`);
+        `chrome,height=${width},width=${height}`);
 
     await new Promise(resolve => {
       reftestWin.addEventListener("load", resolve, {once: true});
@@ -460,21 +460,16 @@ max-width: ${width}px; max-height: ${height}px`;
 
       let ctxInterface = win.CanvasRenderingContext2D;
       let flags = ctxInterface.DRAWWINDOW_DRAW_CARET |
-          ctxInterface.DRAWWINDOW_DRAW_VIEW |
+          ctxInterface.DRAWWINDOW_DRAW_VIEW;
-          ctxInterface.DRAWWINDOW_USE_WIDGET_LAYERS;
 
-      if (!(0 <= browserRect.left &&
+      if (0 <= browserRect.left &&
-            0 <= browserRect.top &&
+          0 <= browserRect.top &&
-            win.innerWidth >= browserRect.width &&
+          win.innerWidth >= browserRect.width &&
-            win.innerHeight >= browserRect.height)) {
+          win.innerHeight >= browserRect.height) {
-        logger.error(`Invalid window dimensions:
+        logger.debug("Using DRAWWINDOW_USE_WIDGET_LAYERS");
-browserRect.left: ${browserRect.left}
+        flags |= ctxInterface.DRAWWINDOW_USE_WIDGET_LAYERS;
-browserRect.top: ${browserRect.top}
+      } else {
-win.innerWidth: ${win.innerWidth}
+        logger.debug("Not using DRAWWINDOW_USE_WIDGET_LAYERS");
-browserRect.width: ${browserRect.width}
-win.innerHeight: ${win.innerHeight}
-browserRect.height: ${browserRect.height}`);
-        throw new Error("Window has incorrect dimensions");
       }
 
       url = new URL(url).href; // normalize the URL

testing/web-platform/meta/2dcontext/imagebitmap/createImageBitmap-origin.sub.html.ini

@@ -2,9 +2,7 @@
   prefs: [network.http.send_window_size:0]
   [redirected to same-origin HTMLVideoElement: origin unclear getImageData]
     expected: FAIL
-
   [redirected to same-origin HTMLVideoElement: origin unclear 2dContext.drawImage]
     expected: FAIL
-
   [redirected to same-origin HTMLVideoElement: origin unclear bitmaprenderer.transferFromImageBitmap]
     expected: FAIL

testing/web-platform/meta/2dcontext/shadows/2d.shadow.enable.blur.html.ini

@@ -1,5 +0,0 @@
-[2d.shadow.enable.blur.html]
-  [Shadows are drawn if shadowBlur is set]
-    expected:
-      if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-

testing/web-platform/meta/WebIDL/ecmascript-binding/constructors.html.ini

@@ -1,7 +0,0 @@
-[constructors.html]
-  [Constructor in child window with bad NewTarget from parent window]
-    expected: FAIL
-
-  [Constructor in parent window with bad NewTarget from child window]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/animate-multiple-effects-on-different-targets-via-main-thread.https.html.ini

@@ -1,4 +0,0 @@
-[animate-multiple-effects-on-different-targets-via-main-thread.https.html]
-  [Animating multiple effects on different targets via main thread should produce new output values accordingly]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/animate-non-accelerated-property.https.html.ini

@@ -1,4 +0,0 @@
-[animate-non-accelerated-property.https.html]
-  [Individual worklet animation should output values at specified local time for corresponding targets and effects]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/animator-animate.https.html.ini

@@ -1,4 +0,0 @@
-[animator-animate.https.html]
-  [Simple worklet animation should output values at specified local time]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/animator-with-options.https.html.ini

@@ -1,4 +0,0 @@
-[animator-with-options.https.html]
-  [Animator should be able to use options to update the animation]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/cancel-non-accelerated-property.https.html.ini

@@ -1,4 +0,0 @@
-[cancel-non-accelerated-property.https.html]
-  [Animation should update the outputs after starting and then return to pre-animated values after being cancelled]
-    expected: FAIL
-

testing/web-platform/meta/animation-worklet/current-time.https.html.ini

@@ -1,5 +1,4 @@
 [current-time.https.html]
-  expected: ERROR
   [The current time returns the hold time when set]
     expected: FAIL
 

testing/web-platform/meta/animation-worklet/multiple-effects-on-same-target-driven-by-individual-local-time.https.html.ini

@@ -1,4 +0,0 @@
-[multiple-effects-on-same-target-driven-by-individual-local-time.https.html]
-  [Animating multiple effects on the same target using effect specific local time should output values\n  relative to each effects unique local time]
-    expected: FAIL
-

testing/web-platform/meta/bluetooth/idl/idlharness.tentative.https.window.js.ini

@@ -533,12 +533,3 @@
   [Navigator interface: navigator must inherit property "bluetooth" with the proper type]
     expected: FAIL
 
-  [Bluetooth interface: navigator.bluetooth must inherit property "onadvertisementreceived" with the proper type]
-    expected: FAIL
-
-  [Bluetooth interface: attribute onadvertisementreceived]
-    expected: FAIL
-
-  [BluetoothDevice interface: attribute onadvertisementreceived]
-    expected: FAIL
-

testing/web-platform/meta/client-hints/sec-ch-ua.https.html.ini

@@ -1,7 +0,0 @@
-[sec-ch-ua.https.html]
-  [Open HTTPS window post-opt-in: `Sec-CH-UA` header with minor version.]
-    expected: FAIL
-
-  [Open HTTPS window prior to opt-in: `Sec-CH-UA` header with minor version.]
-    expected: FAIL
-

testing/web-platform/meta/clipboard-apis/async-navigator-clipboard-basics.https.html.ini

@@ -11,12 +11,3 @@
   [navigator.clipboard.read() succeeds]
     expected: FAIL
 
-  [navigator.clipboard.write(text/plain Blob) succeeds]
-    expected: FAIL
-
-  [navigator.clipboard.read() succeeds]
-    expected: FAIL
-
-  [navigator.clipboard.write(image/png Blob) succeeds]
-    expected: FAIL
-

testing/web-platform/meta/compat/webkit-text-fill-color-property-002.html.ini

@@ -1,4 +1,4 @@
 [webkit-text-fill-color-property-002.html]
   prefs: [layout.css.prefixes.webkit:true]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/content-security-policy/navigate-to/child-navigates-parent-allowed.html.ini

@@ -1,3 +1,3 @@
 [child-navigates-parent-allowed.html]
   disabled:
-    if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1450660
+    if (os == "linux"): https://bugzilla.mozilla.org/show_bug.cgi?id=1450660

testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009a.xht.ini

@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009a.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009b.xht.ini

@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009b.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009e.xht.ini

@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009e.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/css/CSS2/abspos/abspos-containing-block-initial-009f.xht.ini

@@ -1,3 +0,0 @@
-[abspos-containing-block-initial-009f.xht]
-  expected:
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL

testing/web-platform/meta/css/CSS2/backgrounds/background-003.xht.ini

@@ -1,3 +1,3 @@
 [background-003.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/backgrounds/background-root-002.xht.ini

@@ -0,0 +1,3 @@
+[background-root-002.xht]
+  expected:
+    if (os == "linux"): FAIL

testing/web-platform/meta/css/CSS2/backgrounds/background-root-006.xht.ini

@@ -0,0 +1,3 @@
+[background-root-006.xht]
+  expected:
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-001.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-001.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-002.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-002.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-003.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-003.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-005.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-005.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-006.xht.ini

@@ -1,4 +1,4 @@
 [border-applies-to-006.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-012.xht.ini

@@ -1,4 +1,4 @@
 [border-applies-to-012.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-013.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-013.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-applies-to-014.xht.ini

@@ -1,3 +1,3 @@
 [border-applies-to-014.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/borders/border-right-width-095.xht.ini

@@ -0,0 +1,4 @@
+[border-right-width-095.xht]
+  expected:
+    if (os == "linux"): FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/box-display/block-in-inline-001.xht.ini

@@ -1,5 +1,5 @@
 [block-in-inline-001.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/box-display/block-in-inline-002.xht.ini

@@ -1,5 +1,5 @@
 [block-in-inline-002.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/css1/c5525-fltmult-000.xht.ini

@@ -0,0 +1,2 @@
+[c5525-fltmult-000.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini

@@ -1,3 +1,3 @@
 [font-011.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini

@@ -1,3 +1,3 @@
 [font-012.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini

@@ -1,3 +1,3 @@
 [font-013.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini

@@ -1,3 +1,3 @@
 [font-014.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini

@@ -1,3 +1,3 @@
 [font-015.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini

@@ -1,3 +1,3 @@
 [font-016.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini

@@ -1,3 +1,3 @@
 [font-029.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini

@@ -1,3 +1,3 @@
 [font-030.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini

@@ -1,3 +1,3 @@
 [font-031.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini

@@ -1,3 +1,3 @@
 [font-032.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini

@@ -1,3 +1,3 @@
 [font-042.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini

@@ -1,3 +1,3 @@
 [font-043.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-applies-to-001.xht.ini

@@ -1,3 +1,3 @@
 [font-applies-to-001.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-applies-to-007.xht.ini

@@ -1,3 +1,3 @@
 [font-applies-to-007.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-applies-to-017.xht.ini

@@ -1,3 +1,3 @@
 [font-applies-to-017.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-013.xht.ini

@@ -1,3 +1,3 @@
 [font-family-013.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-001.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-002.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-005.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-006.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-007.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-008.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-009.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-010.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-011.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-014.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-015.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini

@@ -1,4 +1,4 @@
 [font-family-applies-to-017.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/generated-content/content-175.xht.ini

@@ -0,0 +1,2 @@
+[content-175.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/generated-content/content-177.xht.ini

@@ -1,5 +1,5 @@
 [content-177.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/inline-svg-100-percent-in-body.html.ini

@@ -1,3 +1,3 @@
 [inline-svg-100-percent-in-body.html]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/linebox/empty-inline-003.xht.ini

@@ -1,4 +1,4 @@
 [empty-inline-003.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-002.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-002.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-003.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-003.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-004.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-004.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-005.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-005.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-006.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-006.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-007.xht.ini

@@ -1,5 +1,5 @@
 [inline-formatting-context-007.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini

@@ -1,3 +1,3 @@
 [inline-formatting-context-013.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini

@@ -0,0 +1,5 @@
+[vertical-align-baseline-004a.xht]
+  expected:
+    if debug and (os == "linux") and (processor == "x86"): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL

testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini

@@ -0,0 +1,5 @@
+[vertical-align-baseline-005a.xht]
+  expected:
+    if debug and (os == "linux") and (processor == "x86"): FAIL
+    if e10s and (os == "linux") and (processor == "x86_64"): FAIL
+    if not debug and e10s and (os == "linux") and (processor == "x86"): FAIL

testing/web-platform/meta/css/CSS2/linebox/vertical-align-sub-001.xht.ini

@@ -1,5 +1,5 @@
 [vertical-align-sub-001.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/linebox/vertical-align-super-001.xht.ini

@@ -1,5 +1,5 @@
 [vertical-align-super-001.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-001.xht.ini

@@ -0,0 +1,2 @@
+[margin-collapse-001.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-020.xht.ini

@@ -1,3 +1,3 @@
 [margin-collapse-020.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-021.xht.ini

@@ -1,3 +1,3 @@
 [margin-collapse-021.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-em-inherit-001.xht.ini

@@ -1,16 +1,2 @@
 [margin-em-inherit-001.xht]
-  expected:
+  expected: FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-103.xht.ini

@@ -0,0 +1,2 @@
+[margin-right-103.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-104.xht.ini

@@ -1,9 +1,2 @@
 [margin-right-104.xht]
-  expected:
+  expected: FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS

testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-113.xht.ini

@@ -0,0 +1,2 @@
+[margin-right-113.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/normal-flow/blocks-020.xht.ini

@@ -0,0 +1,2 @@
+[blocks-020.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/normal-flow/blocks-021.xht.ini

@@ -1,7 +1,2 @@
 [blocks-021.xht]
-  expected:
+  expected: FAIL
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS

testing/web-platform/meta/css/CSS2/normal-flow/blocks-022.xht.ini

@@ -1,19 +1,2 @@
 [blocks-022.xht]
-  expected:
+  expected: FAIL
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): PASS
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and webrender and e10s and (os == "win") and (version == "10.0.17134") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL

testing/web-platform/meta/css/CSS2/normal-flow/blocks-025.xht.ini

@@ -1,3 +1,3 @@
 [blocks-025.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/normal-flow/blocks-026.xht.ini

@@ -1,3 +1,3 @@
 [blocks-026.xht]
   expected:
-    if os == "android": FAIL
+    if (os == "android"): FAIL

testing/web-platform/meta/css/CSS2/normal-flow/inline-block-replaced-width-008.xht.ini

@@ -1,4 +1,2 @@
 [inline-block-replaced-width-008.xht]
-  expected:
+  expected: FAIL
-    if not debug and not webrender and not e10s and (os == "android") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): PASS
-    FAIL

testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-009.xht.ini

@@ -1,5 +1,6 @@
 [inline-replaced-width-009.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "linux": FAIL
+    if (os == "linux"): FAIL
-    if os == "mac": FAIL
+    if (os == "android"): FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/normal-flow/inline-replaced-width-014.xht.ini

@@ -0,0 +1,2 @@
+[inline-replaced-width-014.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-012.xht.ini

@@ -1,4 +1,4 @@
 [max-height-applies-to-012.xht]
   expected:
-    if os == "win": FAIL
+    if (os == "win"): FAIL
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-013.xht.ini

@@ -1,3 +1,3 @@
 [max-height-applies-to-013.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-014.xht.ini

@@ -1,3 +1,3 @@
 [max-height-applies-to-014.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-003c.xht.ini

@@ -0,0 +1,2 @@
+[absolute-replaced-width-003c.xht]
+  expected: FAIL

testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-004.xht.ini

@@ -1,3 +1,3 @@
 [absolute-replaced-width-004.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-009.xht.ini

@@ -1,3 +1,3 @@
 [absolute-replaced-width-009.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL

testing/web-platform/meta/css/CSS2/positioning/absolute-replaced-width-010.xht.ini

@@ -1,3 +1,3 @@
 [absolute-replaced-width-010.xht]
   expected:
-    if os == "mac": FAIL
+    if (os == "mac"): FAIL