From 8886ca62e0bd37c1ea653de483aaa1a5202f1f1c Mon Sep 17 00:00:00 2001
From: Nicolas Chevobbe <nchevobbe@mozilla.com>
Date: Thu, 8 Nov 2018 15:47:53 +0000
Subject: [PATCH 01/77] Bug 1505393 - Add better handling of unsafe getters in
 JsPropertyProvider; r=bgrins.

This patch adds two things to JsPropertyProvider:
- when provided an input which try to access an unsafe
getter properties, the function will indicate that an
unsafe getter should be invoked, with its name.
- a new boolean argument that when set to true would
invoke any unsafe getter that might be in the expression
to be completed.

For simplicity sake, the function only warns the user
of the presence of an unsafe getter when it's the last
property of the expression:

`object.myGetter.` will return that `myGetter` should be invoked
`object.myGetter.a.b.` will not (because then, a and b could
also be getters, and it's getting complex to handle both in
the function itself as in the UI).

Tests are added to ensure this works as expected.

Differential Revision: https://phabricator.services.mozilla.com/D11170

--HG--
extra : moz-landing-system : lando
---
 devtools/shared/DevToolsUtils.js              |  47 +++++-
 .../shared/webconsole/js-property-provider.js |  54 +++++--
 .../test/unit/test_js_property_provider.js    | 153 +++++++++++++-----
 3 files changed, 202 insertions(+), 52 deletions(-)

diff --git a/devtools/shared/DevToolsUtils.js b/devtools/shared/DevToolsUtils.js
index 6cc84f62e592..4249e4cf72a5 100644
--- a/devtools/shared/DevToolsUtils.js
+++ b/devtools/shared/DevToolsUtils.js
@@ -176,13 +176,18 @@ exports.defineLazyPrototypeGetter = function(object, key, callback) {
  * Safely get the property value from a Debugger.Object for a given key. Walks
  * the prototype chain until the property is found.
  *
- * @param Debugger.Object object
+ * @param {Debugger.Object} object
  *        The Debugger.Object to get the value from.
- * @param String key
+ * @param {String} key
  *        The key to look for.
+ * @param {Boolean} invokeUnsafeGetter (defaults to false).
+ *        Optional boolean to indicate if the function should execute unsafe getter
+ *        in order to retrieve its result's properties.
+ *        ⚠️ This should be set to true *ONLY* on user action as it may cause side-effects
+ *        in the content page ⚠️
  * @return Any
  */
-exports.getProperty = function(object, key) {
+exports.getProperty = function(object, key, invokeUnsafeGetters = false) {
   const root = object;
   while (object && exports.isSafeDebuggerObject(object)) {
     let desc;
@@ -198,7 +203,7 @@ exports.getProperty = function(object, key) {
         return desc.value;
       }
       // Call the getter if it's safe.
-      if (exports.hasSafeGetter(desc)) {
+      if (exports.hasSafeGetter(desc) || invokeUnsafeGetters === true) {
         try {
           return desc.get.call(root).return;
         } catch (e) {
@@ -305,6 +310,40 @@ exports.hasSafeGetter = function(desc) {
   return fn && fn.callable && fn.class == "Function" && fn.script === undefined;
 };
 
+/**
+ * Check that the property value from a Debugger.Object for a given key is an unsafe
+ * getter or not. Walks the prototype chain until the property is found.
+ *
+ * @param {Debugger.Object} object
+ *        The Debugger.Object to check on.
+ * @param {String} key
+ *        The key to look for.
+ * @param {Boolean} invokeUnsafeGetter (defaults to false).
+ *        Optional boolean to indicate if the function should execute unsafe getter
+ *        in order to retrieve its result's properties.
+ * @return Boolean
+ */
+exports.isUnsafeGetter = function(object, key) {
+  while (object && exports.isSafeDebuggerObject(object)) {
+    let desc;
+    try {
+      desc = object.getOwnPropertyDescriptor(key);
+    } catch (e) {
+      // The above can throw when the debuggee does not subsume the object's
+      // compartment, or for some WrappedNatives like Cu.Sandbox.
+      return false;
+    }
+    if (desc) {
+      if (Object.getOwnPropertyNames(desc).includes("get")) {
+        return !exports.hasSafeGetter(desc);
+      }
+    }
+    object = object.proto;
+  }
+
+  return false;
+};
+
 /**
  * Check if it is safe to read properties and execute methods from the given JS
  * object. Safety is defined as being protected from unintended code execution
diff --git a/devtools/shared/webconsole/js-property-provider.js b/devtools/shared/webconsole/js-property-provider.js
index 27a37c161ba4..2dc3091aa05a 100644
--- a/devtools/shared/webconsole/js-property-provider.js
+++ b/devtools/shared/webconsole/js-property-provider.js
@@ -194,23 +194,38 @@ function analyzeInputString(str) {
  * Provides a list of properties, that are possible matches based on the passed
  * Debugger.Environment/Debugger.Object and inputValue.
  *
- * @param object dbgObject
+ * @param {Object} dbgObject
  *        When the debugger is not paused this Debugger.Object wraps
  *        the scope for autocompletion.
  *        It is null if the debugger is paused.
- * @param object anEnvironment
+ * @param {Object} anEnvironment
  *        When the debugger is paused this Debugger.Environment is the
  *        scope for autocompletion.
  *        It is null if the debugger is not paused.
- * @param string inputValue
+ * @param {String} inputValue
  *        Value that should be completed.
- * @param number [cursor=inputValue.length]
+ * @param {Number} cursor (defaults to inputValue.length).
  *        Optional offset in the input where the cursor is located. If this is
  *        omitted then the cursor is assumed to be at the end of the input
  *        value.
+ * @param {Boolean} invokeUnsafeGetter (defaults to false).
+ *        Optional boolean to indicate if the function should execute unsafe getter
+ *        in order to retrieve its result's properties.
+ *        ⚠️ This should be set to true *ONLY* on user action as it may cause side-effects
+ *        in the content page ⚠️
  * @returns null or object
- *          If no completion valued could be computed, null is returned,
- *          otherwise a object with the following form is returned:
+ *          If the inputValue is an unsafe getter and invokeUnsafeGetter is false, the
+ *          following form is returned:
+ *
+ *          {
+ *            isUnsafeGetter: true,
+ *            getterName: {String} The name of the unsafe getter
+ *          }
+ *
+ *          If no completion valued could be computed, and the input is not an unsafe
+ *          getter, null is returned.
+ *
+ *          Otherwise an object with the following form is returned:
  *            {
  *              matches: Set<string>
  *              matchProp: Last part of the inputValue that was used to find
@@ -219,7 +234,13 @@ function analyzeInputString(str) {
  *                               access (e.g. `window["addEvent`).
  *            }
  */
-function JSPropertyProvider(dbgObject, anEnvironment, inputValue, cursor) {
+function JSPropertyProvider(
+  dbgObject,
+  anEnvironment,
+  inputValue,
+  cursor,
+  invokeUnsafeGetter = false
+) {
   if (cursor === undefined) {
     cursor = inputValue.length;
   }
@@ -367,18 +388,33 @@ function JSPropertyProvider(dbgObject, anEnvironment, inputValue, cursor) {
 
   // We get the rest of the properties recursively starting from the
   // Debugger.Object that wraps the first property
-  for (let prop of properties) {
+  for (let [index, prop] of properties.entries()) {
     prop = prop.trim();
     if (!prop) {
       return null;
     }
 
+    if (!invokeUnsafeGetter && DevToolsUtils.isUnsafeGetter(obj, prop)) {
+      // If the unsafe getter is not the last property access of the input, bail out as
+      // things might get complex.
+      if (index !== properties.length - 1) {
+        return null;
+      }
+
+      // If we try to access an unsafe getter, return its name so we can consume that
+      // on the frontend.
+      return {
+        isUnsafeGetter: true,
+        getterName: prop,
+      };
+    }
+
     if (hasArrayIndex(prop)) {
       // The property to autocomplete is a member of array. For example
       // list[i][j]..[n]. Traverse the array to get the actual element.
       obj = getArrayMemberProperty(obj, null, prop);
     } else {
-      obj = DevToolsUtils.getProperty(obj, prop);
+      obj = DevToolsUtils.getProperty(obj, prop, invokeUnsafeGetter);
     }
 
     if (!isObjectUsable(obj)) {
diff --git a/devtools/shared/webconsole/test/unit/test_js_property_provider.js b/devtools/shared/webconsole/test/unit/test_js_property_provider.js
index caf49f5363af..897ba127fecc 100644
--- a/devtools/shared/webconsole/test/unit/test_js_property_provider.js
+++ b/devtools/shared/webconsole/test/unit/test_js_property_provider.js
@@ -45,6 +45,24 @@ function run_test() {
     }
   })();`;
 
+  const testGetters = `
+    var testGetters = {
+      get x() {
+        return Object.create(null, Object.getOwnPropertyDescriptors({
+          hello: "",
+          world: "",
+        }));
+      },
+      get y() {
+        return Object.create(null, Object.getOwnPropertyDescriptors({
+          get y() {
+            return "plop";
+          },
+        }));
+      }
+    };
+  `;
+
   const sandbox = Cu.Sandbox("http://example.com");
   const dbg = new Debugger();
   const dbgObject = dbg.addDebuggee(sandbox);
@@ -54,6 +72,7 @@ function run_test() {
   Cu.evalInSandbox(testHyphenated, sandbox);
   Cu.evalInSandbox(testLet, sandbox);
   Cu.evalInSandbox(testGenerators, sandbox);
+  Cu.evalInSandbox(testGetters, sandbox);
 
   info("Running tests with dbgObject");
   runChecks(dbgObject, null, sandbox);
@@ -63,124 +82,126 @@ function run_test() {
 }
 
 function runChecks(dbgObject, dbgEnv, sandbox) {
+  const propertyProvider = (...args) => JSPropertyProvider(dbgObject, dbgEnv, ...args);
+
   info("Test that suggestions are given for 'this'");
-  let results = JSPropertyProvider(dbgObject, dbgEnv, "t");
+  let results = propertyProvider("t");
   test_has_result(results, "this");
 
   if (dbgObject != null) {
     info("Test that suggestions are given for 'this.'");
-    results = JSPropertyProvider(dbgObject, dbgEnv, "this.");
+    results = propertyProvider("this.");
     test_has_result(results, "testObject");
 
     info("Test that no suggestions are given for 'this.this'");
-    results = JSPropertyProvider(dbgObject, dbgEnv, "this.this");
+    results = propertyProvider("this.this");
     test_has_no_results(results);
   }
 
   info("Testing lexical scope issues (Bug 1207868)");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "foobar");
+  results = propertyProvider("foobar");
   test_has_result(results, "foobar");
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "foobar.");
+  results = propertyProvider("foobar.");
   test_has_result(results, "a");
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "blargh");
+  results = propertyProvider("blargh");
   test_has_result(results, "blargh");
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "blargh.");
+  results = propertyProvider("blargh.");
   test_has_result(results, "a");
 
   info("Test that suggestions are given for 'foo[n]' where n is an integer.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[0].");
+  results = propertyProvider("testArray[0].");
   test_has_result(results, "propA");
 
   info("Test that suggestions are given for multidimensional arrays.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[2][0].");
+  results = propertyProvider("testArray[2][0].");
   test_has_result(results, "propE");
 
   info("Test that suggestions are given for nested arrays.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[1].propC[0].");
+  results = propertyProvider("testArray[1].propC[0].");
   test_has_result(results, "indexOf");
 
   info("Test that suggestions are given for literal arrays.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "[1,2,3].");
+  results = propertyProvider("[1,2,3].");
   test_has_result(results, "indexOf");
 
   info("Test that suggestions are given for literal arrays with newlines.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "[1,2,3,\n4\n].");
+  results = propertyProvider("[1,2,3,\n4\n].");
   test_has_result(results, "indexOf");
 
   info("Test that suggestions are given for literal strings.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'foo'.");
+  results = propertyProvider("'foo'.");
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, '"foo".');
+  results = propertyProvider('"foo".');
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo`.");
+  results = propertyProvider("`foo`.");
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo doc`.");
+  results = propertyProvider("`foo doc`.");
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo \" doc`.");
+  results = propertyProvider("`foo \" doc`.");
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo \' doc`.");
+  results = propertyProvider("`foo \' doc`.");
   test_has_result(results, "charAt");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'[1,2,3]'.");
+  results = propertyProvider("'[1,2,3]'.");
   test_has_result(results, "charAt");
 
   info("Test that suggestions are not given for syntax errors.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'foo\"");
+  results = propertyProvider("'foo\"");
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'foo d");
+  results = propertyProvider("'foo d");
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, `"foo d`);
+  results = propertyProvider(`"foo d`);
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo d");
+  results = propertyProvider("`foo d");
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "[1,',2]");
+  results = propertyProvider("[1,',2]");
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'[1,2].");
+  results = propertyProvider("'[1,2].");
   Assert.equal(null, results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'foo'..");
+  results = propertyProvider("'foo'..");
   Assert.equal(null, results);
 
   info("Test that suggestions are not given without a dot.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "'foo'");
+  results = propertyProvider("'foo'");
   test_has_no_results(results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "`foo`");
+  results = propertyProvider("`foo`");
   test_has_no_results(results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "[1,2,3]");
+  results = propertyProvider("[1,2,3]");
   test_has_no_results(results);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "[1,2,3].\n'foo'");
+  results = propertyProvider("[1,2,3].\n'foo'");
   test_has_no_results(results);
 
   info("Test that suggestions are not given for numeric literals.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "1.");
+  results = propertyProvider("1.");
   Assert.equal(null, results);
 
   info("Test that suggestions are not given for index that's out of bounds.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[10].");
+  results = propertyProvider("testArray[10].");
   Assert.equal(null, results);
 
   info("Test that no suggestions are given if an index is not numerical "
        + "somewhere in the chain.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[0]['propC'][0].");
+  results = propertyProvider("testArray[0]['propC'][0].");
   Assert.equal(null, results);
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testObject['propA'][0].");
+  results = propertyProvider("testObject['propA'][0].");
   Assert.equal(null, results);
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[0]['propC'].");
+  results = propertyProvider("testArray[0]['propC'].");
   Assert.equal(null, results);
 
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testArray[][1].");
+  results = propertyProvider("testArray[][1].");
   Assert.equal(null, results);
 
   info("Test that suggestions are not given if there is an hyphen in the chain.");
-  results = JSPropertyProvider(dbgObject, dbgEnv, "testHyphenated['prop-A'].");
+  results = propertyProvider("testHyphenated['prop-A'].");
   Assert.equal(null, results);
 
   info("Test that we have suggestions for generators.");
   const gen1Result = Cu.evalInSandbox("gen1.next().value", sandbox);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "gen1.");
+  results = propertyProvider("gen1.");
   test_has_result(results, "next");
   info("Test that the generator next() was not executed");
   const gen1NextResult = Cu.evalInSandbox("gen1.next().value", sandbox);
@@ -188,10 +209,53 @@ function runChecks(dbgObject, dbgEnv, sandbox) {
 
   info("Test with an anonymous generator.");
   const gen2Result = Cu.evalInSandbox("gen2.next().value", sandbox);
-  results = JSPropertyProvider(dbgObject, dbgEnv, "gen2.");
+  results = propertyProvider("gen2.");
   test_has_result(results, "next");
   const gen2NextResult = Cu.evalInSandbox("gen2.next().value", sandbox);
   Assert.equal(gen2Result + 1, gen2NextResult);
+
+  info("Test that getters are not executed if invokeUnsafeGetter is undefined");
+  results = propertyProvider("testGetters.x.");
+  Assert.deepEqual(results, {isUnsafeGetter: true, getterName: "x"});
+
+  results = propertyProvider("testGetters.x[");
+  Assert.deepEqual(results, {isUnsafeGetter: true, getterName: "x"});
+
+  results = propertyProvider("testGetters.x.hell");
+  Assert.deepEqual(results, {isUnsafeGetter: true, getterName: "x"});
+
+  results = propertyProvider("testGetters.x['hell");
+  Assert.deepEqual(results, {isUnsafeGetter: true, getterName: "x"});
+
+  info("Test that deep getter property access does not return intermediate getters");
+  results = propertyProvider("testGetters.y.y.");
+  Assert.ok(results === null);
+
+  results = propertyProvider("testGetters['y'].y.");
+  Assert.ok(results === null);
+
+  results = propertyProvider("testGetters['y']['y'].");
+  Assert.ok(results === null);
+
+  results = propertyProvider("testGetters.y['y'].");
+  Assert.ok(results === null);
+
+  info("Test that getters are executed if invokeUnsafeGetter is true");
+  results = propertyProvider("testGetters.x.", undefined, true);
+  test_has_exact_results(results, ["hello", "world"]);
+  Assert.ok(Object.keys(results).includes("isUnsafeGetter") === false);
+  Assert.ok(Object.keys(results).includes("getterName") === false);
+
+  info("Test that executing getters filters with provided string");
+  results = propertyProvider("testGetters.x.hell", undefined, true);
+  test_has_exact_results(results, ["hello"]);
+
+  results = propertyProvider("testGetters.x['hell", undefined, true);
+  test_has_exact_results(results, ["'hello'"]);
+
+  info("Test that children getters are executed if invokeUnsafeGetter is true");
+  results = propertyProvider("testGetters.y.y.", undefined, true);
+  test_has_result(results, "trim");
 }
 
 /**
@@ -215,3 +279,14 @@ function test_has_result(results, requiredSuggestion) {
   Assert.ok(results.matches.size > 0);
   Assert.ok(results.matches.has(requiredSuggestion));
 }
+
+/**
+ * A helper that ensures results are the expected ones.
+ * @param Object results
+ *        The results returned by JSPropertyProvider.
+ * @param Array expectedMatches
+ *        An array of the properties that should be returned by JsPropertyProvider.
+ */
+function test_has_exact_results(results, expectedMatches) {
+  Assert.deepEqual([...results.matches], expectedMatches);
+}

From 9dd96cfda233e30d6b2fd28a1d54e26b32363e7e Mon Sep 17 00:00:00 2001
From: Micah Tigley <mtigley@mozilla.com>
Date: Thu, 8 Nov 2018 10:29:19 +0000
Subject: [PATCH 02/77] Bug 1497179 - Avoid overlapping labels in the flex item
 outline. r=pbro

Differential Revision: https://phabricator.services.mozilla.com/D9431

--HG--
extra : moz-landing-system : lando
---
 .../components/FlexItemSizingOutline.js       | 17 +++++++--
 .../client/inspector/flexbox/test/browser.ini |  1 +
 .../browser_flexbox_item_outline_exists.js    |  6 ---
 ...ine_renders_basisfinal_points_correctly.js | 37 +++++++++++++++++++
 devtools/client/themes/layout.css             | 14 ++++---
 5 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js

diff --git a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
index 263fa3be62fe..92aa09930e88 100644
--- a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
+++ b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
@@ -54,8 +54,8 @@ class FlexItemSizingOutline extends PureComponent {
     );
   }
 
-  renderPoint(name) {
-    return dom.div({ className: `flex-outline-point ${name}`, "data-label": name });
+  renderPoint(className, label = className) {
+    return dom.div({ className: `flex-outline-point ${className}`, "data-label": label });
   }
 
   render() {
@@ -138,6 +138,16 @@ class FlexItemSizingOutline extends PureComponent {
     }
     gridTemplateColumns += "]";
 
+    // Check the final and basis points to see if they are the same and if so, combine
+    // them into a single rendered point.
+    const renderedBaseAndFinalPoints = [];
+    if (mainFinalSize === mainBaseSize) {
+      renderedBaseAndFinalPoints.push(this.renderPoint("basisfinal", "basis/final"));
+    } else {
+      renderedBaseAndFinalPoints.push(this.renderPoint("basis"));
+      renderedBaseAndFinalPoints.push(this.renderPoint("final"));
+    }
+
     return (
       dom.div({ className: "flex-outline-container" },
         dom.div(
@@ -150,8 +160,7 @@ class FlexItemSizingOutline extends PureComponent {
               gridTemplateColumns,
             },
           },
-          this.renderPoint("basis"),
-          this.renderPoint("final"),
+          renderedBaseAndFinalPoints,
           showMin ? this.renderPoint("min") : null,
           showMax ? this.renderPoint("max") : null,
           this.renderBasisOutline(mainBaseSize),
diff --git a/devtools/client/inspector/flexbox/test/browser.ini b/devtools/client/inspector/flexbox/test/browser.ini
index ebed5849b10a..f385986816ab 100644
--- a/devtools/client/inspector/flexbox/test/browser.ini
+++ b/devtools/client/inspector/flexbox/test/browser.ini
@@ -22,6 +22,7 @@ support-files =
 [browser_flexbox_item_outline_exists.js]
 [browser_flexbox_item_outline_has_correct_layout.js]
 [browser_flexbox_item_outline_hidden_when_useless.js]
+[browser_flexbox_item_outline_renders_basisfinal_points_correctly.js]
 [browser_flexbox_item_outline_rotates_for_column.js]
 [browser_flexbox_pseudo_elements_are_listed.js]
 [browser_flexbox_sizing_flexibility_not_displayed_when_useless.js]
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
index 54e5d5f56032..34b79d38ca3b 100644
--- a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
+++ b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
@@ -25,10 +25,4 @@ add_task(async function() {
 
   ok(basis, "The basis outline exists");
   ok(final, "The final outline exists");
-
-  const [basisPoint, finalPoint] = [...flexOutlineContainer.querySelectorAll(
-    ".flex-outline-point.basis, .flex-outline-point.final")];
-
-  ok(basisPoint, "The basis point exists");
-  ok(finalPoint, "The final point exists");
 });
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
new file mode 100644
index 000000000000..8d98228eb62c
--- /dev/null
+++ b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
@@ -0,0 +1,37 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that the flex item outline renders the basis and final points as a single point
+// if their sizes are equal. If not, then render as separate points.
+
+const TEST_URI = URL_ROOT + "doc_flexbox_simple.html";
+
+add_task(async function() {
+  await addTab(TEST_URI);
+  const { inspector, flexboxInspector } = await openLayoutView();
+  const { document: doc } = flexboxInspector;
+
+  info("Select a flex item whose basis size matches its final size.");
+  let onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
+  await selectNode(".item", inspector);
+  let [flexOutlineContainer] = await onFlexItemOutlineRendered;
+
+  const [basisFinalPoint] = [...flexOutlineContainer.querySelectorAll(
+    ".flex-outline-point.basisfinal")];
+
+  ok(basisFinalPoint, "The basis/final point exists");
+
+  info("Select a flex item whose basis size is different than its final size.");
+  onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
+  await selectNode(".shrinking .item", inspector);
+  [flexOutlineContainer] = await onFlexItemOutlineRendered;
+
+  const [basis, final] = [...flexOutlineContainer.querySelectorAll(
+    ".flex-outline-point.basis, .flex-outline-point.final")];
+
+  ok(basis, "The basis point exists");
+  ok(final, "The final point exists");
+});
diff --git a/devtools/client/themes/layout.css b/devtools/client/themes/layout.css
index a22593333ea7..519bda0f5016 100644
--- a/devtools/client/themes/layout.css
+++ b/devtools/client/themes/layout.css
@@ -304,7 +304,8 @@
   grid-row: 1;
 }
 
-.flex-outline-point.basis {
+.flex-outline-point.basis,
+.flex-outline-point.basisfinal {
   grid-column-end: basis-end;
   justify-self: end;
 }
@@ -357,7 +358,8 @@
 }
 
 .flex-outline-point.basis::before,
-.flex-outline-point.final::before {
+.flex-outline-point.final::before,
+.flex-outline-point.basisfinal::before {
   top: -12px;
 }
 
@@ -366,7 +368,7 @@
   bottom: -12px;
 }
 
-.flex-outline.column .flex-outline-point.min::before,
+.flex-outline.column .flex-outline-point.max::before,
 .flex-outline.column .flex-outline-point.min::before {
   text-indent: -12px;
 }
@@ -374,13 +376,15 @@
 .flex-outline-point.final::before,
 .flex-outline.shrinking .flex-outline-point.min::before,
 .flex-outline-point.max::before,
-.flex-outline.shrinking .flex-outline-point.basis::before {
+.flex-outline.shrinking .flex-outline-point.basis::before,
+.flex-outline.column .flex-outline-point.basisfinal::before {
   border-width: 0 0 0 1px;
 }
 
 .flex-outline-point.basis::before,
 .flex-outline-point.min::before,
-.flex-outline.shrinking .flex-outline-point.final::before {
+.flex-outline.shrinking .flex-outline-point.final::before,
+.flex-outline.row .flex-outline-point.basisfinal::before {
   border-width: 0 1px 0 0;
 }
 

From d7b88ffd5da3e9bb3e1917b7e5266f72cda38164 Mon Sep 17 00:00:00 2001
From: Kirk Steuber <ksteuber@mozilla.com>
Date: Thu, 8 Nov 2018 16:41:07 +0000
Subject: [PATCH 03/77] Bug 1503362 - Clear the app.update.enabled pref from
 profiles now that it is no longer in use r=rstrong

Differential Revision: https://phabricator.services.mozilla.com/D11128

--HG--
extra : moz-landing-system : lando
---
 toolkit/mozapps/update/nsUpdateService.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/toolkit/mozapps/update/nsUpdateService.js b/toolkit/mozapps/update/nsUpdateService.js
index 2bfd38e1466d..bb90c9155bec 100644
--- a/toolkit/mozapps/update/nsUpdateService.js
+++ b/toolkit/mozapps/update/nsUpdateService.js
@@ -1706,6 +1706,11 @@ UpdateService.prototype = {
   observe: function AUS_observe(subject, topic, data) {
     switch (topic) {
       case "post-update-processing":
+        // This pref was not cleared out of profiles after it stopped being used
+        // (Bug 1420514), so clear it out on the next update to avoid confusion
+        // regarding its use.
+        Services.prefs.clearUserPref("app.update.enabled");
+
         if (readStatusFile(getUpdatesDir()) == STATE_SUCCEEDED) {
           // After a successful update the post update preference needs to be
           // set early during startup so applications can perform post update

From cf7a1248cfa318de5136893fe2ba6cbc1930a4a8 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 8 Nov 2018 16:56:30 +0000
Subject: [PATCH 04/77] Bug 1505328 - Remove the theme transition from the
 title bar. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D11282

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/browser.inc.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index f4e954e644a0..12f4d01b3d82 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -19,10 +19,6 @@
   --space-above-tabbar: 8px;
 }
 
-:root[sessionrestored]:-moz-lwtheme {
-  transition: @themeTransition@;
-}
-
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {

From 22809b0ee552727a0f3f786bb529d29ce892051b Mon Sep 17 00:00:00 2001
From: Collin Wing <masterkrombi@gmail.com>
Date: Thu, 8 Nov 2018 16:57:14 +0000
Subject: [PATCH 05/77] Bug 1504751 Migrate about:networking to Fluent
 r=jaws,flod

Differential Revision: https://phabricator.services.mozilla.com/D10977

--HG--
extra : moz-landing-system : lando
---
 .../bug_1504751_aboutnetworking.py            |  89 +++++++++++
 toolkit/content/aboutNetworking.xhtml         | 140 +++++++++---------
 .../en-US/chrome/global/aboutNetworking.dtd   |  59 --------
 .../en-US/toolkit/about/aboutNetworking.ftl   |  61 ++++++++
 toolkit/locales/jar.mn                        |   1 -
 5 files changed, 217 insertions(+), 133 deletions(-)
 create mode 100644 python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
 delete mode 100644 toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
 create mode 100644 toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl

diff --git a/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py b/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
new file mode 100644
index 000000000000..6e56a0687031
--- /dev/null
+++ b/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
@@ -0,0 +1,89 @@
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate import REPLACE
+from fluent.migrate import COPY
+
+
+def migrate(ctx):
+    """ Bug 1504751 - Migrate about:Networking to Fluent, part {index}. """
+
+    ctx.add_transforms(
+        "toolkit/toolkit/about/aboutNetworking.ftl",
+        "toolkit/toolkit/about/aboutNetworking.ftl",
+        transforms_from(
+"""
+title = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.title")}
+warning = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.warning")}
+show-next-time-checkbox = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.showNextTime")}
+ok = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.ok")}
+http = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.HTTP")}
+sockets = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.sockets")}
+dns = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dns")}
+websockets = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.websockets")}
+refresh = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.refresh")}
+auto-refresh = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.autoRefresh")}
+hostname = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.hostname")}
+port = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.port")}
+http2 = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.http2")}
+ssl = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.ssl")}
+active = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.active")}
+idle = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.idle")}
+host = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.host")}
+tcp = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.tcp")}
+sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.sent")}
+received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.received")}
+family = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.family")}
+trr = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.trr")}
+addresses = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.addresses")}
+expires = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.expires")}
+messages-sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.messagesSent")}
+messages-received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.messagesReceived")}
+bytes-sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.bytesSent")}
+bytes-received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.bytesReceived")}
+logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.logging")}
+current-log-file = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.currentLogFile")}
+current-log-modules = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.currentLogModules")}
+set-log-file = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.setLogFile")}
+set-log-modules = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.setLogModules")}
+start-logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.startLogging")}
+stop-logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.stopLogging")}
+dns-lookup = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookup")}
+dns-lookup-button = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookupButton")}
+dns-domain = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsDomain")}
+dns-lookup-table-column = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookupTableColumn")}
+rcwn = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwn")}
+rcwn-status = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnStatus")}
+rcwn-cache-won-count = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheWonCount")}
+rcwn-net-won-count = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnNetWonCount")}
+total-network-requests = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.totalNetworkRequests")}
+rcwn-operation = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnOperation")}
+rcwn-perf-open = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfOpen")}
+rcwn-perf-read = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfRead")}
+rcwn-perf-write = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfWrite")}
+rcwn-perf-entry-open = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfEntryOpen")}
+rcwn-avg-short = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnAvgShort")}
+rcwn-avg-long = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnAvgLong")}
+rcwn-std-dev-long = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnStddevLong")}
+rcwn-cache-slow = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheSlow")}
+rcwn-cache-not-slow = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheNotSlow")}
+"""
+        )
+    )
+
+    ctx.add_transforms(
+        "toolkit/toolkit/about/aboutNetworking.ftl",
+        "toolkit/toolkit/about/aboutNetworking.ftl",
+        [
+            FTL.Message(
+            id=FTL.Identifier("log-tutorial"),
+            value=REPLACE(
+                "toolkit/chrome/global/aboutNetworking.dtd",
+                "aboutNetworking.logTutorial",
+                {
+                    "href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging'": FTL.TextElement('data-l10n-name="logging"')
+                }
+            )
+        )
+    ]
+)
diff --git a/toolkit/content/aboutNetworking.xhtml b/toolkit/content/aboutNetworking.xhtml
index 4f756bc06b1d..e8aa321fb3e2 100644
--- a/toolkit/content/aboutNetworking.xhtml
+++ b/toolkit/content/aboutNetworking.xhtml
@@ -4,65 +4,59 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-<!DOCTYPE html [
-<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
-<!ENTITY % networkingDTD SYSTEM "chrome://global/locale/aboutNetworking.dtd"> %networkingDTD;
-]>
+<!DOCTYPE html>
 
-<html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;">
+<html xmlns="http://www.w3.org/1999/xhtml">
     <head>
-        <title>&aboutNetworking.title;</title>
+        <title data-l10n-id="title"/>
         <link rel="stylesheet" href="chrome://mozapps/skin/aboutNetworking.css" type="text/css" />
         <script type="application/javascript" src="chrome://global/content/aboutNetworking.js" />
+        <link rel="localization"  href="toolkit/about/aboutNetworking.ftl"/>
     </head>
     <body id="body">
         <div id="warning_message" class="warningBackground" hidden="true">
             <div class="container">
-                <h1 class="title">&aboutNetworking.warning;</h1>
+                <h1 class="title" data-l10n-id="warning"/>
                 <div class="toggle-container-with-text">
                     <input id="warncheck" type="checkbox" checked="yes" role="checkbox" />
-                    <label for="warncheck">&aboutNetworking.showNextTime;</label>
+                    <label for="warncheck" data-l10n-id="show-next-time-checkbox"/>
                 </div>
                 <div>
-                    <button id="confpref" class="primary">&aboutNetworking.ok;</button>
+                    <button id="confpref" class="primary" data-l10n-id="ok"/>
                 </div>
             </div>
         </div>
         <div id="categories">
             <div class="category" selected="true" id="category-http">
-                <span class="category-name">&aboutNetworking.HTTP;</span>
+                <span class="category-name" data-l10n-id="http"/>
             </div>
             <div class="category" id="category-sockets">
-                <span class="category-name">&aboutNetworking.sockets;</span>
+                <span class="category-name" data-l10n-id="sockets"/>
             </div>
             <div class="category" id="category-dns">
-                <span class="category-name">&aboutNetworking.dns;</span>
+                <span class="category-name" data-l10n-id="dns"/>
             </div>
             <div class="category" id="category-websockets">
-                <span class="category-name">&aboutNetworking.websockets;</span>
+                <span class="category-name" data-l10n-id="websockets"/>
             </div>
             <hr></hr>
             <div class="category" id="category-dnslookuptool">
-                <span class="category-name">&aboutNetworking.dnsLookup;</span>
+                <span class="category-name" data-l10n-id="dns-lookup"/>
             </div>
             <div class="category" id="category-logging">
-                <span class="category-name">&aboutNetworking.logging;</span>
+                <span class="category-name" data-l10n-id="logging"/>
             </div>
             <div class="category" id="category-rcwn">
-                <span class="category-name">&aboutNetworking.rcwn;</span>
+                <span class="category-name" data-l10n-id="rcwn"/>
             </div>
         </div>
         <div class="main-content">
             <div class="header">
-                <div id="sectionTitle" class="header-name">
-                    &aboutNetworking.HTTP;
-                </div>
+                <div id="sectionTitle" class="header-name" data-l10n-id="http"/>
                 <div id="refreshDiv" class="toggle-container-with-text">
-                    <button id="refreshButton">&aboutNetworking.refresh;</button>
+                    <button id="refreshButton" data-l10n-id="refresh"/>
                     <input id="autorefcheck" type="checkbox" name="Autorefresh" role="checkbox" />
-                    <label for="autorefcheck">&aboutNetworking.autoRefresh;</label>
+                    <label for="autorefcheck" data-l10n-id="auto-refresh"/>
                 </div>
             </div>
 
@@ -70,12 +64,12 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.hostname;</th>
-                          <th>&aboutNetworking.port;</th>
-                          <th>&aboutNetworking.http2;</th>
-                          <th>&aboutNetworking.ssl;</th>
-                          <th>&aboutNetworking.active;</th>
-                          <th>&aboutNetworking.idle;</th>
+                          <th data-l10n-id="hostname"/>
+                          <th data-l10n-id="port"/>
+                          <th data-l10n-id="http2"/>
+                          <th data-l10n-id="ssl"/>
+                          <th data-l10n-id="active"/>
+                          <th data-l10n-id="idle"/>
                       </tr>
                   </thead>
                   <tbody id="http_content" />
@@ -86,12 +80,12 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.host;</th>
-                          <th>&aboutNetworking.port;</th>
-                          <th>&aboutNetworking.tcp;</th>
-                          <th>&aboutNetworking.active;</th>
-                          <th>&aboutNetworking.sent;</th>
-                          <th>&aboutNetworking.received;</th>
+                          <th data-l10n-id="host"/>
+                          <th data-l10n-id="port"/>
+                          <th data-l10n-id="tcp"/>
+                          <th data-l10n-id="active"/>
+                          <th data-l10n-id="sent"/>
+                          <th data-l10n-id="received"/>
                       </tr>
                   </thead>
                   <tbody id="sockets_content" />
@@ -102,11 +96,11 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.hostname;</th>
-                          <th>&aboutNetworking.family;</th>
-                          <th>&aboutNetworking.trr;</th>
-                          <th>&aboutNetworking.addresses;</th>
-                          <th>&aboutNetworking.expires;</th>
+                          <th data-l10n-id="hostname"/>
+                          <th data-l10n-id="family"/>
+                          <th data-l10n-id="trr"/>
+                          <th data-l10n-id="addresses"/>
+                          <th data-l10n-id="expires"/>
                       </tr>
                   </thead>
                   <tbody id="dns_content" />
@@ -117,26 +111,26 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.hostname;</th>
-                          <th>&aboutNetworking.ssl;</th>
-                          <th>&aboutNetworking.messagesSent;</th>
-                          <th>&aboutNetworking.messagesReceived;</th>
-                          <th>&aboutNetworking.bytesSent;</th>
-                          <th>&aboutNetworking.bytesReceived;</th>
+                          <th data-l10n-id="hostname"/>
+                          <th data-l10n-id="ssl"/>
+                          <th data-l10n-id="messages-sent"/>
+                          <th data-l10n-id="messages-received"/>
+                          <th data-l10n-id="bytes-sent"/>
+                          <th data-l10n-id="bytesReceived"/>
                       </tr>
                   </thead>
                   <tbody id="websockets_content" />
               </table>
           </div>
 
-          <div id="dnslookuptool" class="tab" hidden="true">
-              &aboutNetworking.dnsDomain;: <input type="text" name="host" id="host"></input>
-              <button id="dnsLookupButton">&aboutNetworking.dnsLookupButton;</button>
+          <div id="dnslookuptool" class="tab" hidden="true" data-l10n-id="dns-domain">
+              <input type="text" name="host" id="host"></input>
+              <button id="dnsLookupButton" data-l10n-id="dns-lookup-button"/>
               <hr/>
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.dnsLookupTableColumn;</th>
+                          <th data-l10n-id="dns-lookup-table-column"/>
                       </tr>
                   </thead>
                   <tbody id="dnslookuptool_content" />
@@ -147,10 +141,10 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.rcwnStatus;</th>
-                          <th>&aboutNetworking.totalNetworkRequests;</th>
-                          <th>&aboutNetworking.rcwnCacheWonCount;</th>
-                          <th>&aboutNetworking.rcwnNetWonCount;</th>
+                          <th data-l10n-id="rcwn-status"/>
+                          <th data-l10n-id="total-network-requests"/>
+                          <th data-l10n-id="rcwn-cache-won-count"/>
+                          <th data-l10n-id="rcwn-net-won-count"/>
                       </tr>
                   </thead>
                   <tbody id="rcwn_content">
@@ -168,33 +162,33 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.rcwnOperation;</th>
-                          <th>&aboutNetworking.rcwnAvgShort;</th>
-                          <th>&aboutNetworking.rcwnAvgLong;</th>
-                          <th>&aboutNetworking.rcwnStddevLong;</th>
+                          <th data-l10n-id="rcwn-operation"/>
+                          <th data-l10n-id="rcwn-avg-short"/>
+                          <th data-l10n-id="rcwn-avg-long"/>
+                          <th data-l10n-id="rcwn-std-dev-long"/>
                       </tr>
                   </thead>
                   <tbody id="cacheperf_content">
                       <tr>
-                          <td>&aboutNetworking.rcwnPerfOpen;</td>
+                          <td data-l10n-id="rcwn-perf-open"/>
                           <td id="rcwn_perfstats_open_avgShort"> </td>
                           <td id="rcwn_perfstats_open_avgLong"> </td>
                           <td id="rcwn_perfstats_open_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td>&aboutNetworking.rcwnPerfRead;</td>
+                          <td data-l10n-id="rcwn-perf-read"/>
                           <td id="rcwn_perfstats_read_avgShort"> </td>
                           <td id="rcwn_perfstats_read_avgLong"> </td>
                           <td id="rcwn_perfstats_read_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td>&aboutNetworking.rcwnPerfWrite;</td>
+                          <td data-l10n-id="rcwn-perf-write"/>
                           <td id="rcwn_perfstats_write_avgShort"> </td>
                           <td id="rcwn_perfstats_write_avgLong"> </td>
                           <td id="rcwn_perfstats_write_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td>&aboutNetworking.rcwnPerfEntryOpen;</td>
+                          <td data-l10n-id="rcwn-perf-entry-open"/>
                           <td id="rcwn_perfstats_entryopen_avgShort"> </td>
                           <td id="rcwn_perfstats_entryopen_avgLong"> </td>
                           <td id="rcwn_perfstats_entryopen_stddevLong"> </td>
@@ -207,8 +201,8 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&aboutNetworking.rcwnCacheSlow;</th>
-                          <th>&aboutNetworking.rcwnCacheNotSlow;</th>
+                          <th data-l10n-id="rcwn-cache-slow"/>
+                          <th data-l10n-id="rcwn-cache-not-slow"/>
                       </tr>
                   </thead>
                   <tbody>
@@ -222,24 +216,24 @@
 
           <div id="logging" class="tab" hidden="true">
             <div>
-              &aboutNetworking.logTutorial;
+                <a href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging' data-l10n-name="logging"></a>
             </div>
             <br/>
             <div>
-              <button id="start-logging-button"> &aboutNetworking.startLogging; </button>
-              <button id="stop-logging-button"> &aboutNetworking.stopLogging; </button>
+              <button id="start-logging-button" data-l10n-id="start-logging"/>
+              <button id="stop-logging-button" data-l10n-id="stop-logging"/>
             </div>
             <br/>
             <br/>
-            <div>
-              &aboutNetworking.currentLogFile; <div id="current-log-file"></div><br/>
+            <div data-l10n-id="current-log-file">
+              <div id="current-log-file"></div><br/>
               <input type="text" name="log-file" id="log-file"></input>
-              <button id="set-log-file-button"> &aboutNetworking.setLogFile; </button>
+              <button id="set-log-file-button" data-l10n-id="set-log-file"/>
             </div>
-            <div>
-              &aboutNetworking.currentLogModules; <div id="current-log-modules"></div><br/>
+            <div data-l10n-id="current-log-modules">
+              <div id="current-log-modules"></div><br/>
               <input type="text" name="log-modules" id="log-modules" value="timestamp,sync,nsHttp:5,cache2:5,nsSocketTransport:5,nsHostResolver:5"></input>
-              <button id="set-log-modules-button"> &aboutNetworking.setLogModules; </button>
+              <button id="set-log-modules-button" data-l10n-id="set-log-modules"/>
             </div>
           </div>
 
diff --git a/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd b/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
deleted file mode 100644
index 63ecb44fddd3..000000000000
--- a/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
+++ /dev/null
@@ -1,59 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY aboutNetworking.title                 "About Networking">
-<!ENTITY aboutNetworking.warning               "This is very experimental. Do not use without adult supervision.">
-<!ENTITY aboutNetworking.showNextTime          "Show this warning next time">
-<!ENTITY aboutNetworking.ok                    "OK">
-<!ENTITY aboutNetworking.HTTP                  "HTTP">
-<!ENTITY aboutNetworking.sockets               "Sockets">
-<!ENTITY aboutNetworking.dns                   "DNS">
-<!ENTITY aboutNetworking.websockets            "WebSockets">
-<!ENTITY aboutNetworking.refresh               "Refresh">
-<!ENTITY aboutNetworking.autoRefresh           "Autorefresh every 3 seconds">
-<!ENTITY aboutNetworking.hostname              "Hostname">
-<!ENTITY aboutNetworking.port                  "Port">
-<!ENTITY aboutNetworking.http2                 "HTTP/2">
-<!ENTITY aboutNetworking.ssl                   "SSL">
-<!ENTITY aboutNetworking.active                "Active">
-<!ENTITY aboutNetworking.idle                  "Idle">
-<!ENTITY aboutNetworking.host                  "Host">
-<!ENTITY aboutNetworking.tcp                   "TCP">
-<!ENTITY aboutNetworking.sent                  "Sent">
-<!ENTITY aboutNetworking.received              "Received">
-<!ENTITY aboutNetworking.family                "Family">
-<!ENTITY aboutNetworking.trr                   "TRR">
-<!ENTITY aboutNetworking.addresses             "Addresses">
-<!ENTITY aboutNetworking.expires               "Expires (Seconds)">
-<!ENTITY aboutNetworking.messagesSent          "Messages Sent">
-<!ENTITY aboutNetworking.messagesReceived      "Messages Received">
-<!ENTITY aboutNetworking.bytesSent             "Bytes Sent">
-<!ENTITY aboutNetworking.bytesReceived         "Bytes Received">
-<!ENTITY aboutNetworking.logging               "Logging">
-<!ENTITY aboutNetworking.logTutorial           "See <a href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging'>HTTP Logging</a> for instructions on how to use this tool.">
-<!ENTITY aboutNetworking.currentLogFile        "Current Log File:">
-<!ENTITY aboutNetworking.currentLogModules     "Current Log Modules:">
-<!ENTITY aboutNetworking.setLogFile            "Set Log File">
-<!ENTITY aboutNetworking.setLogModules         "Set Log Modules">
-<!ENTITY aboutNetworking.startLogging          "Start Logging">
-<!ENTITY aboutNetworking.stopLogging           "Stop Logging">
-<!ENTITY aboutNetworking.dnsLookup             "DNS Lookup">
-<!ENTITY aboutNetworking.dnsLookupButton       "Resolve">
-<!ENTITY aboutNetworking.dnsDomain             "Domain">
-<!ENTITY aboutNetworking.dnsLookupTableColumn  "IPs">
-<!ENTITY aboutNetworking.rcwn                  "RCWN Stats">
-<!ENTITY aboutNetworking.rcwnStatus            "RCWN Status">
-<!ENTITY aboutNetworking.rcwnCacheWonCount     "Cache won count">
-<!ENTITY aboutNetworking.rcwnNetWonCount       "Net won count">
-<!ENTITY aboutNetworking.totalNetworkRequests  "Total network request count">
-<!ENTITY aboutNetworking.rcwnOperation         "Cache Operation">
-<!ENTITY aboutNetworking.rcwnPerfOpen          "Open">
-<!ENTITY aboutNetworking.rcwnPerfRead          "Read">
-<!ENTITY aboutNetworking.rcwnPerfWrite         "Write">
-<!ENTITY aboutNetworking.rcwnPerfEntryOpen     "Entry Open">
-<!ENTITY aboutNetworking.rcwnAvgShort          "Short Average">
-<!ENTITY aboutNetworking.rcwnAvgLong           "Long Average">
-<!ENTITY aboutNetworking.rcwnStddevLong        "Long Standard Deviation">
-<!ENTITY aboutNetworking.rcwnCacheSlow         "Cache slow count">
-<!ENTITY aboutNetworking.rcwnCacheNotSlow      "Cache not slow count">
diff --git a/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl b/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl
new file mode 100644
index 000000000000..a3f4e0d518fc
--- /dev/null
+++ b/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl
@@ -0,0 +1,61 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+title = About Networking
+warning = This is very experimental. Do not use without adult supervision.
+show-next-time-checkbox = Show this warning next time
+ok = OK
+http = HTTP
+sockets = Sockets
+dns = DNS
+websockets = WebSockets
+refresh = Refresh
+auto-refresh = Autorefresh every 3 seconds
+hostname = Hostname
+port = Port
+http2 = HTTP/2
+ssl = SSL
+active = Active
+idle = Idle
+host = Host
+tcp = TCP
+sent = Sent
+received = Received
+family = Family
+trr = TRR
+addresses = Addresses
+expires = Expires (Seconds)
+messages-sent = Messages Sent
+messages-received = Messages Received
+bytes-sent = Bytes Sent
+bytes-received = Bytes Received
+logging = Logging
+log-tutorial =
+    See <a data-l10n-name="logging">HTTP Logging</a>
+    for instructions on how to use this tool.
+current-log-file = Current Log File:
+current-log-modules = Current Log Modules:
+set-log-file = Set Log File
+set-log-modules = Set Log Modules
+start-logging = Start Logging
+stop-logging = Stop Logging
+dns-lookup = DNS Lookup
+dns-lookup-button = Resolve
+dns-domain = Domain
+dns-lookup-table-column = IPs
+rcwn = RCWN Stats
+rcwn-status = RCWN Status
+rcwn-cache-won-count = Cache won count
+rcwn-net-won-count = Net won count
+total-network-requests = Total network request count
+rcwn-operation = Cache Operation
+rcwn-perf-open = Open
+rcwn-perf-read = Read
+rcwn-perf-write = Write
+rcwn-perf-entry-open = Entry Open
+rcwn-avg-short = Short Average
+rcwn-avg-long = Long Average
+rcwn-std-dev-long = Long Standard Deviation
+rcwn-cache-slow = Cache slow count
+rcwn-cache-not-slow = Cache not slow count
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index b823d47bc8e8..53435714a83a 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -11,7 +11,6 @@
 % locale global @AB_CD@ %locale/@AB_CD@/global/
   locale/@AB_CD@/global/aboutReader.properties          (%chrome/global/aboutReader.properties)
   locale/@AB_CD@/global/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
-  locale/@AB_CD@/global/aboutNetworking.dtd             (%chrome/global/aboutNetworking.dtd)
   locale/@AB_CD@/global/aboutStudies.properties         (%chrome/global/aboutStudies.properties)
   locale/@AB_CD@/global/aboutServiceWorkers.dtd         (%chrome/global/aboutServiceWorkers.dtd)
   locale/@AB_CD@/global/aboutServiceWorkers.properties  (%chrome/global/aboutServiceWorkers.properties)

From 9bf3c6a0892692b977c318f409cb57d8adf06641 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 8 Nov 2018 17:04:55 +0000
Subject: [PATCH 06/77] Bug 1500158 - Implement marionette support for fuzzy
 reftests, r=ato

This adds an extra field to the reftest comaprisons to hold the
minumum/maximum allowed differences per pixel channel and the
minumum/maximum number of pixels that may differ.

Differential Revision: https://phabricator.services.mozilla.com/D9129

--HG--
extra : moz-landing-system : lando
---
 testing/marionette/reftest.js | 42 +++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/testing/marionette/reftest.js b/testing/marionette/reftest.js
index 64c6b5422985..3cccc4982421 100644
--- a/testing/marionette/reftest.js
+++ b/testing/marionette/reftest.js
@@ -237,19 +237,19 @@ max-width: ${REFTEST_WIDTH}px; max-height: ${REFTEST_HEIGHT}px`;
     let stack = [];
     for (let i = references.length - 1; i >= 0; i--) {
       let item = references[i];
-      stack.push([testUrl, item[0], item[1], item[2]]);
+      stack.push([testUrl, ...item]);
     }
 
     let done = false;
 
     while (stack.length && !done) {
-      let [lhsUrl, rhsUrl, references, relation] = stack.pop();
+      let [lhsUrl, rhsUrl, references, relation, extras = {}] = stack.pop();
       result.message += `Testing ${lhsUrl} ${relation} ${rhsUrl}\n`;
 
       let comparison;
       try {
         comparison = await this.compareUrls(
-            win, lhsUrl, rhsUrl, relation, timeout);
+            win, lhsUrl, rhsUrl, relation, timeout, extras);
       } catch (e) {
         comparison = {lhs: null, rhs: null, passed: false, error: e};
       }
@@ -318,7 +318,7 @@ max-width: ${REFTEST_WIDTH}px; max-height: ${REFTEST_HEIGHT}px`;
     return result;
   }
 
-  async compareUrls(win, lhsUrl, rhsUrl, relation, timeout) {
+  async compareUrls(win, lhsUrl, rhsUrl, relation, timeout, extras) {
     logger.info(`Testing ${lhsUrl} ${relation} ${rhsUrl}`);
 
     // Take the reference screenshot first so that if we pause
@@ -326,44 +326,58 @@ max-width: ${REFTEST_WIDTH}px; max-height: ${REFTEST_HEIGHT}px`;
     let rhs = await this.screenshot(win, rhsUrl, timeout);
     let lhs = await this.screenshot(win, lhsUrl, timeout);
 
-    let maxDifferences = {};
-
     logger.debug(`lhs canvas size ${lhs.canvas.width}x${lhs.canvas.height}`);
     logger.debug(`rhs canvas size ${rhs.canvas.width}x${rhs.canvas.height}`);
 
-    let error = null;
     let passed;
+    let error = null;
+    let pixelsDifferent = null;
+    let maxDifferences = {};
 
-    let differences;
     try {
-      differences = this.windowUtils.compareCanvases(
+      pixelsDifferent = this.windowUtils.compareCanvases(
           lhs.canvas, rhs.canvas, maxDifferences);
     } catch (e) {
-      differences = null;
       passed = false;
       error = e;
     }
 
     if (error === null) {
+      passed = this.isAcceptableDifference(
+          maxDifferences.value, pixelsDifferent, extras.fuzzy);
       switch (relation) {
         case "==":
-          passed = differences === 0;
           if (!passed) {
-            logger.info(`Found ${differences} pixels different, ` +
+            logger.info(`Found ${pixelsDifferent} pixels different, ` +
                         `maximum difference per channel ${maxDifferences.value}`);
           }
           break;
         case "!=":
-          passed = differences !== 0;
+          passed = !passed;
           break;
         default:
           throw new InvalidArgumentError("Reftest operator should be '==' or '!='");
+
+
       }
     }
-
     return {lhs, rhs, passed, error};
   }
 
+  isAcceptableDifference(maxDifference, pixelsDifferent, allowed) {
+    if (!allowed) {
+      logger.info(`No differences allowed`);
+      return pixelsDifferent === 0;
+    }
+    let [allowedDiff, allowedPixels] = allowed;
+    logger.info(`Allowed ${allowedPixels.join("-")} pixels different, ` +
+                `maximum difference per channel ${allowedDiff.join("-")}`);
+    return ((maxDifference >= allowedDiff[0] &&
+             maxDifference <= allowedDiff[1]) &&
+            (pixelsDifferent >= allowedPixels[0] ||
+             pixelsDifferent <= allowedPixels[1]));
+  }
+
   async screenshot(win, url, timeout) {
     win.innerWidth = REFTEST_WIDTH;
     win.innerHeight = REFTEST_HEIGHT;

From 9345293ba717b6ac113b358c5d3c60265391fc01 Mon Sep 17 00:00:00 2001
From: Andreas Farre <farre@mozilla.com>
Date: Thu, 8 Nov 2018 17:10:59 +0000
Subject: [PATCH 07/77] Bug 1501138 - Make sure that timeout iterator advances.
 r=peterv

Differential Revision: https://phabricator.services.mozilla.com/D11327

--HG--
extra : moz-landing-system : lando
---
 dom/base/TimeoutManager.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dom/base/TimeoutManager.cpp b/dom/base/TimeoutManager.cpp
index f0ec9c7809cd..a9e64e3e4934 100644
--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@@ -793,6 +793,7 @@ TimeoutManager::RunTimeout(const TimeStamp& aNow, const TimeStamp& aTargetDeadli
     for (RefPtr<Timeout> timeout = mTimeouts.GetFirst();
          timeout != nullptr;
          timeout = next) {
+      next = timeout->getNext();
       // We should only execute callbacks for the set of expired Timeout
       // objects we computed above.
       if (timeout->mFiringId != firingId) {

From 8e6a787c3d67b0af0ae372967e03cb899d0a692a Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Thu, 8 Nov 2018 16:46:58 +0000
Subject: [PATCH 08/77] Bug 1505172 - Remove references to
 devtools.debugger.forbid-certified-apps preference. r=jdescottes,jryans

MozReview-Commit-ID: JV8MXvIuXaa

Differential Revision: https://phabricator.services.mozilla.com/D11152

--HG--
extra : moz-landing-system : lando
---
 devtools/client/locales/en-US/webide.dtd      |  6 --
 .../client/webide/content/runtimedetails.js   | 88 -------------------
 .../webide/content/runtimedetails.xhtml       | 17 ----
 .../client/webide/themes/runtimedetails.css   | 18 ----
 .../tests/mochitest/test_preference.html      |  1 -
 .../tests/unit/test_actor-registry-actor.js   |  4 -
 .../shared/preferences/devtools-shared.js     |  2 -
 7 files changed, 136 deletions(-)

diff --git a/devtools/client/locales/en-US/webide.dtd b/devtools/client/locales/en-US/webide.dtd
index 106823b5f5bb..7bdf151b6ad8 100644
--- a/devtools/client/locales/en-US/webide.dtd
+++ b/devtools/client/locales/en-US/webide.dtd
@@ -118,12 +118,6 @@
 
 <!-- Runtime Details -->
 <!ENTITY runtimedetails_title "Runtime Info">
-<!ENTITY runtimedetails_adbIsRoot "ADB is root: ">
-<!ENTITY runtimedetails_summonADBRoot "root device">
-<!ENTITY runtimedetails_ADBRootWarning "(requires unlocked bootloader)">
-<!ENTITY runtimedetails_unrestrictedPrivileges "Unrestricted DevTools privileges: ">
-<!ENTITY runtimedetails_requestPrivileges "request higher privileges">
-<!ENTITY runtimedetails_privilegesWarning "(Will reboot device. Requires root access.)">
 
 <!-- Device Preferences and Settings -->
 <!ENTITY device_typeboolean "Boolean">
diff --git a/devtools/client/webide/content/runtimedetails.js b/devtools/client/webide/content/runtimedetails.js
index 93082b2f2c87..5f7af1de68cd 100644
--- a/devtools/client/webide/content/runtimedetails.js
+++ b/devtools/client/webide/content/runtimedetails.js
@@ -3,24 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-const Services = require("Services");
 const {AppManager} = require("devtools/client/webide/modules/app-manager");
 const {Connection} = require("devtools/shared/client/connection-manager");
-const {RuntimeTypes} = require("devtools/client/webide/modules/runtime-types");
-const Strings = Services.strings.createBundle("chrome://devtools/locale/webide.properties");
-
-const UNRESTRICTED_HELP_URL = "https://developer.mozilla.org/docs/Tools/WebIDE/Running_and_debugging_apps#Unrestricted_app_debugging_%28including_certified_apps_main_process_etc.%29";
 
 window.addEventListener("load", function() {
   document.querySelector("#close").onclick = CloseUI;
-  document.querySelector("#devtools-check button").onclick = EnableCertApps;
-  document.querySelector("#adb-check button").onclick = RootADB;
-  document.querySelector("#unrestricted-privileges").onclick = function() {
-    window.parent.UI.openInBrowser(UNRESTRICTED_HELP_URL);
-  };
   AppManager.on("app-manager-update", OnAppManagerUpdate);
   BuildUI();
-  CheckLockState();
 }, {capture: true, once: true});
 
 window.addEventListener("unload", function() {
@@ -34,7 +23,6 @@ function CloseUI() {
 function OnAppManagerUpdate(what) {
   if (what == "connection" || what == "runtime-global-actors") {
     BuildUI();
-    CheckLockState();
   }
 }
 
@@ -67,79 +55,3 @@ function BuildUI() {
     CloseUI();
   }
 }
-
-function CheckLockState() {
-  const adbCheckResult = document.querySelector("#adb-check > .yesno");
-  const devtoolsCheckResult = document.querySelector("#devtools-check > .yesno");
-  const flipCertPerfButton = document.querySelector("#devtools-check button");
-  const flipCertPerfAction = document.querySelector("#devtools-check > .action");
-  const adbRootAction = document.querySelector("#adb-check > .action");
-
-  const sYes = Strings.GetStringFromName("runtimedetails_checkyes");
-  const sNo = Strings.GetStringFromName("runtimedetails_checkno");
-  const sNotUSB = Strings.GetStringFromName("runtimedetails_notUSBDevice");
-
-  flipCertPerfButton.setAttribute("disabled", "true");
-  flipCertPerfAction.setAttribute("hidden", "true");
-  adbRootAction.setAttribute("hidden", "true");
-
-  adbCheckResult.textContent = "";
-  devtoolsCheckResult.textContent = "";
-
-  if (AppManager.connection &&
-      AppManager.connection.status == Connection.Status.CONNECTED) {
-    // ADB check
-    if (AppManager.selectedRuntime.type === RuntimeTypes.USB) {
-      const device = AppManager.selectedRuntime.device;
-      if (device && device.summonRoot) {
-        device.isRoot().then(isRoot => {
-          if (isRoot) {
-            adbCheckResult.textContent = sYes;
-            flipCertPerfButton.removeAttribute("disabled");
-          } else {
-            adbCheckResult.textContent = sNo;
-            adbRootAction.removeAttribute("hidden");
-          }
-        }, console.error);
-      }
-    } else {
-      adbCheckResult.textContent = sNotUSB;
-    }
-
-    // forbid-certified-apps check
-    try {
-      const prefFront = AppManager.preferenceFront;
-      prefFront.getBoolPref("devtools.debugger.forbid-certified-apps").then(isForbidden => {
-        if (isForbidden) {
-          devtoolsCheckResult.textContent = sNo;
-          flipCertPerfAction.removeAttribute("hidden");
-        } else {
-          devtoolsCheckResult.textContent = sYes;
-        }
-      }, console.error);
-    } catch (e) {
-      // Exception. pref actor is only accessible if forbird-certified-apps is false
-      devtoolsCheckResult.textContent = sNo;
-      flipCertPerfAction.removeAttribute("hidden");
-    }
-  }
-}
-
-function EnableCertApps() {
-  const device = AppManager.selectedRuntime.device;
-  // TODO: Remove `network.disable.ipc.security` once bug 1125916 is fixed.
-  device.shell(
-    "stop b2g && " +
-    "cd /data/b2g/mozilla/*.default/ && " +
-    "echo 'user_pref(\"devtools.debugger.forbid-certified-apps\", false);' >> prefs.js && " +
-    "echo 'user_pref(\"dom.apps.developer_mode\", true);' >> prefs.js && " +
-    "echo 'user_pref(\"network.disable.ipc.security\", true);' >> prefs.js && " +
-    "echo 'user_pref(\"dom.webcomponents.shadowdom.enabled\", true);' >> prefs.js && " +
-    "start b2g"
-  );
-}
-
-function RootADB() {
-  const device = AppManager.selectedRuntime.device;
-  device.summonRoot().then(CheckLockState, console.error);
-}
diff --git a/devtools/client/webide/content/runtimedetails.xhtml b/devtools/client/webide/content/runtimedetails.xhtml
index 41ee15f8b884..fecc59f9ef6f 100644
--- a/devtools/client/webide/content/runtimedetails.xhtml
+++ b/devtools/client/webide/content/runtimedetails.xhtml
@@ -24,23 +24,6 @@
 
     <h1>&runtimedetails_title;</h1>
 
-    <div id="devicePrivileges">
-      <p id="adb-check">
-        &runtimedetails_adbIsRoot;<span class="yesno"></span>
-        <div class="action">
-          <button>&runtimedetails_summonADBRoot;</button>
-          <em>&runtimedetails_ADBRootWarning;</em>
-        </div>
-      </p>
-      <p id="devtools-check">
-        <a id="unrestricted-privileges">&runtimedetails_unrestrictedPrivileges;</a><span class="yesno"></span>
-        <div class="action">
-          <button>&runtimedetails_requestPrivileges;</button>
-          <em>&runtimedetails_privilegesWarning;</em>
-        </div>
-      </p>
-    </div>
-
     <table></table>
   </body>
 </html>
diff --git a/devtools/client/webide/themes/runtimedetails.css b/devtools/client/webide/themes/runtimedetails.css
index 91ced5bff9f9..cac9c1917358 100644
--- a/devtools/client/webide/themes/runtimedetails.css
+++ b/devtools/client/webide/themes/runtimedetails.css
@@ -5,21 +5,3 @@
 html, body {
   background: white;
 }
-
-#devicePrivileges {
-  font-family: monospace;
-  padding-left: 6px;
-}
-
-#devtools-check > a {
-  color: #4C9ED9;
-  cursor: pointer;
-}
-
-.action {
-  display: inline;
-}
-
-.action[hidden] {
-  display: none;
-}
diff --git a/devtools/server/tests/mochitest/test_preference.html b/devtools/server/tests/mochitest/test_preference.html
index a4089efeec21..8681fa01757f 100644
--- a/devtools/server/tests/mochitest/test_preference.html
+++ b/devtools/server/tests/mochitest/test_preference.html
@@ -102,7 +102,6 @@ function runTests() {
 window.onload = function() {
   SpecialPowers.pushPrefEnv({
     "set": [
-      ["devtools.debugger.forbid-certified-apps", false],
       ["test.all.bool", true],
       ["test.all.int", 0x4321],
       ["test.all.string", "allizom"],
diff --git a/devtools/server/tests/unit/test_actor-registry-actor.js b/devtools/server/tests/unit/test_actor-registry-actor.js
index c1160a8b08bd..e893cb230103 100644
--- a/devtools/server/tests/unit/test_actor-registry-actor.js
+++ b/devtools/server/tests/unit/test_actor-registry-actor.js
@@ -10,11 +10,8 @@
 var gClient;
 var gRegistryFront;
 var gActorFront;
-var gOldPref;
 
 function run_test() {
-  gOldPref = Services.prefs.getBoolPref("devtools.debugger.forbid-certified-apps");
-  Services.prefs.setBoolPref("devtools.debugger.forbid-certified-apps", false);
   initTestDebuggerServer();
   DebuggerServer.registerAllActors();
   gClient = new DebuggerClient(DebuggerServer.connectPipe());
@@ -71,7 +68,6 @@ function testActorIsUnregistered() {
   gClient.listTabs().then(({ helloActor }) => {
     Assert.ok(!helloActor);
 
-    Services.prefs.setBoolPref("devtools.debugger.forbid-certified-apps", gOldPref);
     finishClient(gClient);
   });
 }
diff --git a/devtools/shared/preferences/devtools-shared.js b/devtools/shared/preferences/devtools-shared.js
index 7e75b07a17ca..7c47f98fa223 100644
--- a/devtools/shared/preferences/devtools-shared.js
+++ b/devtools/shared/preferences/devtools-shared.js
@@ -37,8 +37,6 @@ pref("devtools.debugger.remote-port", 6000);
 pref("devtools.debugger.remote-websocket", false);
 // Force debugger server binding on the loopback interface
 pref("devtools.debugger.force-local", true);
-// Block tools from seeing / interacting with certified apps
-pref("devtools.debugger.forbid-certified-apps", true);
 
 // Limit for intercepted response bodies (1 MB)
 // Possible values:

From e94bad01ea4f688b5e516ee206b751fa8eccca63 Mon Sep 17 00:00:00 2001
From: shindli <shindli@mozilla.com>
Date: Thu, 8 Nov 2018 19:21:35 +0200
Subject: [PATCH 09/77] Backed out changeset 39825c67e39c (bug 1497179) in 
 devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
 CLOSED TREE

---
 .../components/FlexItemSizingOutline.js       | 17 ++-------
 .../client/inspector/flexbox/test/browser.ini |  1 -
 .../browser_flexbox_item_outline_exists.js    |  6 +++
 ...ine_renders_basisfinal_points_correctly.js | 37 -------------------
 devtools/client/themes/layout.css             | 14 +++----
 5 files changed, 15 insertions(+), 60 deletions(-)
 delete mode 100644 devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js

diff --git a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
index 92aa09930e88..263fa3be62fe 100644
--- a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
+++ b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
@@ -54,8 +54,8 @@ class FlexItemSizingOutline extends PureComponent {
     );
   }
 
-  renderPoint(className, label = className) {
-    return dom.div({ className: `flex-outline-point ${className}`, "data-label": label });
+  renderPoint(name) {
+    return dom.div({ className: `flex-outline-point ${name}`, "data-label": name });
   }
 
   render() {
@@ -138,16 +138,6 @@ class FlexItemSizingOutline extends PureComponent {
     }
     gridTemplateColumns += "]";
 
-    // Check the final and basis points to see if they are the same and if so, combine
-    // them into a single rendered point.
-    const renderedBaseAndFinalPoints = [];
-    if (mainFinalSize === mainBaseSize) {
-      renderedBaseAndFinalPoints.push(this.renderPoint("basisfinal", "basis/final"));
-    } else {
-      renderedBaseAndFinalPoints.push(this.renderPoint("basis"));
-      renderedBaseAndFinalPoints.push(this.renderPoint("final"));
-    }
-
     return (
       dom.div({ className: "flex-outline-container" },
         dom.div(
@@ -160,7 +150,8 @@ class FlexItemSizingOutline extends PureComponent {
               gridTemplateColumns,
             },
           },
-          renderedBaseAndFinalPoints,
+          this.renderPoint("basis"),
+          this.renderPoint("final"),
           showMin ? this.renderPoint("min") : null,
           showMax ? this.renderPoint("max") : null,
           this.renderBasisOutline(mainBaseSize),
diff --git a/devtools/client/inspector/flexbox/test/browser.ini b/devtools/client/inspector/flexbox/test/browser.ini
index f385986816ab..ebed5849b10a 100644
--- a/devtools/client/inspector/flexbox/test/browser.ini
+++ b/devtools/client/inspector/flexbox/test/browser.ini
@@ -22,7 +22,6 @@ support-files =
 [browser_flexbox_item_outline_exists.js]
 [browser_flexbox_item_outline_has_correct_layout.js]
 [browser_flexbox_item_outline_hidden_when_useless.js]
-[browser_flexbox_item_outline_renders_basisfinal_points_correctly.js]
 [browser_flexbox_item_outline_rotates_for_column.js]
 [browser_flexbox_pseudo_elements_are_listed.js]
 [browser_flexbox_sizing_flexibility_not_displayed_when_useless.js]
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
index 34b79d38ca3b..54e5d5f56032 100644
--- a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
+++ b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
@@ -25,4 +25,10 @@ add_task(async function() {
 
   ok(basis, "The basis outline exists");
   ok(final, "The final outline exists");
+
+  const [basisPoint, finalPoint] = [...flexOutlineContainer.querySelectorAll(
+    ".flex-outline-point.basis, .flex-outline-point.final")];
+
+  ok(basisPoint, "The basis point exists");
+  ok(finalPoint, "The final point exists");
 });
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
deleted file mode 100644
index 8d98228eb62c..000000000000
--- a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* vim: set ts=2 et sw=2 tw=80: */
-/* Any copyright is dedicated to the Public Domain.
- http://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-// Test that the flex item outline renders the basis and final points as a single point
-// if their sizes are equal. If not, then render as separate points.
-
-const TEST_URI = URL_ROOT + "doc_flexbox_simple.html";
-
-add_task(async function() {
-  await addTab(TEST_URI);
-  const { inspector, flexboxInspector } = await openLayoutView();
-  const { document: doc } = flexboxInspector;
-
-  info("Select a flex item whose basis size matches its final size.");
-  let onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
-  await selectNode(".item", inspector);
-  let [flexOutlineContainer] = await onFlexItemOutlineRendered;
-
-  const [basisFinalPoint] = [...flexOutlineContainer.querySelectorAll(
-    ".flex-outline-point.basisfinal")];
-
-  ok(basisFinalPoint, "The basis/final point exists");
-
-  info("Select a flex item whose basis size is different than its final size.");
-  onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
-  await selectNode(".shrinking .item", inspector);
-  [flexOutlineContainer] = await onFlexItemOutlineRendered;
-
-  const [basis, final] = [...flexOutlineContainer.querySelectorAll(
-    ".flex-outline-point.basis, .flex-outline-point.final")];
-
-  ok(basis, "The basis point exists");
-  ok(final, "The final point exists");
-});
diff --git a/devtools/client/themes/layout.css b/devtools/client/themes/layout.css
index 519bda0f5016..a22593333ea7 100644
--- a/devtools/client/themes/layout.css
+++ b/devtools/client/themes/layout.css
@@ -304,8 +304,7 @@
   grid-row: 1;
 }
 
-.flex-outline-point.basis,
-.flex-outline-point.basisfinal {
+.flex-outline-point.basis {
   grid-column-end: basis-end;
   justify-self: end;
 }
@@ -358,8 +357,7 @@
 }
 
 .flex-outline-point.basis::before,
-.flex-outline-point.final::before,
-.flex-outline-point.basisfinal::before {
+.flex-outline-point.final::before {
   top: -12px;
 }
 
@@ -368,7 +366,7 @@
   bottom: -12px;
 }
 
-.flex-outline.column .flex-outline-point.max::before,
+.flex-outline.column .flex-outline-point.min::before,
 .flex-outline.column .flex-outline-point.min::before {
   text-indent: -12px;
 }
@@ -376,15 +374,13 @@
 .flex-outline-point.final::before,
 .flex-outline.shrinking .flex-outline-point.min::before,
 .flex-outline-point.max::before,
-.flex-outline.shrinking .flex-outline-point.basis::before,
-.flex-outline.column .flex-outline-point.basisfinal::before {
+.flex-outline.shrinking .flex-outline-point.basis::before {
   border-width: 0 0 0 1px;
 }
 
 .flex-outline-point.basis::before,
 .flex-outline-point.min::before,
-.flex-outline.shrinking .flex-outline-point.final::before,
-.flex-outline.row .flex-outline-point.basisfinal::before {
+.flex-outline.shrinking .flex-outline-point.final::before {
   border-width: 0 1px 0 0;
 }
 

From dac06861c5199861784d9a21ee95bfcf411bb22d Mon Sep 17 00:00:00 2001
From: shindli <shindli@mozilla.com>
Date: Thu, 8 Nov 2018 19:41:56 +0200
Subject: [PATCH 10/77] Backed out changeset b87e5f53d029 (bug 1505328) for bc
 failures in
 toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js

---
 browser/themes/shared/browser.inc.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index 12f4d01b3d82..f4e954e644a0 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -19,6 +19,10 @@
   --space-above-tabbar: 8px;
 }
 
+:root[sessionrestored]:-moz-lwtheme {
+  transition: @themeTransition@;
+}
+
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {

From 8ae579514031f296f65113024c7533f55d317a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 8 Nov 2018 17:43:23 +0000
Subject: [PATCH 11/77] Bug 1505801 - Use --lwt-accent-color behind
 --toolbar-bgcolor in the find bar background. r=ntim

Differential Revision: https://phabricator.services.mozilla.com/D11348

--HG--
extra : moz-landing-system : lando
---
 browser/themes/linux/browser.css   | 5 +++++
 browser/themes/osx/browser.css     | 4 ++--
 browser/themes/windows/browser.css | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 6d2e3d6c8895..5ab69b97ac6b 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -451,6 +451,11 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 .browserContainer > findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
+}
+
+.browserContainer > findbar:-moz-lwtheme {
+  background-color: var(--lwt-accent-color);
+  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   text-shadow: none;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 474edc2b6cda..57bd3b71a23b 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -566,8 +566,8 @@ html|input.urlbar-input {
 }
 
 .browserContainer > findbar:-moz-lwtheme {
-  background-color: var(--toolbar-bgcolor);
-  background-image: none;
+  background-color: var(--lwt-accent-color);
+  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   color: var(--toolbar-color);
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 9419a6e70135..8b88afaa202c 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -665,6 +665,11 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
 .browserContainer > findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
+}
+
+.browserContainer > findbar:-moz-lwtheme {
+  background-color: var(--lwt-accent-color);
+  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   text-shadow: none;
 }
 

From d98f3d6c79f038842269501bab51e99d8854fa88 Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 8 Nov 2018 18:16:15 +0000
Subject: [PATCH 12/77] Bug 1505739 - Enable wpt CSS reftests on Mac,
 r=automatedtester

Differential Revision: https://phabricator.services.mozilla.com/D11309

--HG--
extra : moz-landing-system : lando
---
 taskcluster/ci/test/web-platform.yml             | 11 ++---------
 testing/mozharness/scripts/web_platform_tests.py |  3 ---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index c3a7ddb98449..293602a9c4b3 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -88,11 +88,7 @@ web-platform-tests-reftests:
     description: "Web platform reftest run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(Wr)
-    chunks:
-        by-test-platform:
-            macosx.*: 1
-            default: 6
-
+    chunks: 6
     e10s:
         by-test-platform:
             linux32/debug: both
@@ -116,10 +112,7 @@ web-platform-tests-reftests-headless:
     description: "Web platform reftest headless run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(WrH)
-    chunks:
-        by-test-platform:
-            macosx.*: 1
-            default: 6
+    chunks: 6
     e10s:
         by-test-platform:
             linux32/debug: both
diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py
index 292f6b4b7fa5..dfac8debefe6 100755
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -230,9 +230,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
             cmd += ["--device-serial=%s" % self.device_serial]
             cmd += ["--package-name=%s" % self.query_package_name()]
 
-        if sys.platform == "darwin":
-            cmd += ["--exclude=css"]
-
         if mozinfo.info["os"] == "win" and mozinfo.info["os_version"] == "6.1":
             # On Windows 7 --install-fonts fails, so fall back to a Firefox-specific codepath
             self._install_fonts()

From fd0811e3f78b258130f3416f152ef3f1843e86ce Mon Sep 17 00:00:00 2001
From: James Graham <james@hoppipolla.co.uk>
Date: Thu, 8 Nov 2018 18:17:09 +0000
Subject: [PATCH 13/77] Bug 1505739 - Update wpt expectation data for mac
 reftests, r=automatedtester

Depends on D11309

Differential Revision: https://phabricator.services.mozilla.com/D11310

--HG--
extra : moz-landing-system : lando
---
 .../CSS2/backgrounds/background-color-049.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-052.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-053.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-054.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-070.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-073.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-074.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-075.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-090.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-093.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-094.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-095.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-110.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-113.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-114.xht.ini  |  4 ----
 .../CSS2/backgrounds/background-color-115.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-010.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-011.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-012.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-013.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-014.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-015.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-016.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-017.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-018.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-019.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-020.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-021.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-022.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-023.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-024.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-025.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-026.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-027.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-028.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-029.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-030.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-031.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-032.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-033.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-034.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-035.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-036.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-037.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-038.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-039.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-040.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-041.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-042.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-043.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-044.xht.ini  |  4 ----
 .../css/CSS2/bidi-text/bidi-box-model-045.xht.ini  |  4 ----
 .../bidi-text/direction-applies-to-001.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-002.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-003.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-004.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-005.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-006.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-007.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-009.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-012.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-013.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-014.xht.ini     |  4 ----
 .../bidi-text/direction-applies-to-015.xht.ini     |  4 ----
 .../CSS2/bidi-text/line-breaking-bidi-001.xht.ini  |  4 ----
 .../CSS2/bidi-text/line-breaking-bidi-002.xht.ini  |  4 ----
 .../CSS2/bidi-text/line-breaking-bidi-003.xht.ini  |  4 ----
 .../meta/css/CSS2/borders/border-001.xht.ini       |  4 ----
 .../meta/css/CSS2/borders/border-003.xht.ini       |  4 ----
 .../CSS2/borders/border-bottom-width-080.xht.ini   |  4 ----
 .../CSS2/borders/border-bottom-width-083.xht.ini   |  4 ----
 .../CSS2/borders/border-bottom-width-084.xht.ini   |  4 ----
 .../css/CSS2/borders/border-left-width-080.xht.ini |  4 ----
 .../css/CSS2/borders/border-left-width-083.xht.ini |  4 ----
 .../css/CSS2/borders/border-left-width-084.xht.ini |  4 ----
 .../CSS2/borders/border-right-width-080.xht.ini    |  4 ----
 .../CSS2/borders/border-right-width-083.xht.ini    |  4 ----
 .../CSS2/borders/border-right-width-084.xht.ini    |  4 ----
 .../css/CSS2/borders/border-top-width-080.xht.ini  |  4 ----
 .../css/CSS2/borders/border-top-width-083.xht.ini  |  4 ----
 .../css/CSS2/borders/border-top-width-084.xht.ini  |  4 ----
 .../borders/border-width-applies-to-008.xht.ini    |  4 ----
 .../anonymous-boxes-inheritance-001.xht.ini        |  4 ----
 .../box-display/block-in-inline-relpos-001.xht.ini |  4 ----
 .../CSS2/box-display/display-change-001.xht.ini    |  4 ----
 .../meta/css/CSS2/colors/color-001.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-002.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-003.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-004.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-005.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-006.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-007.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-008.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-009.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-010.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-011.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-012.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-013.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-014.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-015.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-016.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-017.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-018.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-019.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-020.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-021.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-022.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-023.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-024.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-025.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-026.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-027.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-028.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-029.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-031.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-032.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-033.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-034.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-035.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-036.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-037.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-038.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-039.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-040.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-041.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-042.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-043.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-044.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-045.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-046.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-047.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-048.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-049.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-050.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-051.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-052.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-053.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-054.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-055.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-056.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-057.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-058.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-059.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-060.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-061.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-062.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-063.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-064.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-065.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-066.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-067.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-068.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-069.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-070.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-071.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-072.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-073.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-074.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-075.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-076.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-077.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-078.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-079.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-080.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-081.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-082.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-083.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-084.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-085.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-086.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-087.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-088.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-089.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-090.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-091.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-092.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-093.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-094.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-095.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-096.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-097.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-098.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-099.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-100.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-101.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-102.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-103.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-104.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-105.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-106.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-107.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-108.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-109.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-110.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-111.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-112.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-113.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-114.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-115.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-116.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-117.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-118.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-119.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-120.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-121.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-122.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-123.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-124.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-125.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-126.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-127.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-128.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-129.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-130.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-131.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-132.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-133.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-134.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-135.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-136.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-137.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-138.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-139.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-140.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-141.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-142.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-143.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-144.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-145.xht.ini         |  3 ---
 .../meta/css/CSS2/colors/color-174.xht.ini         |  3 ---
 .../meta/css/CSS2/css1/c412-blockw-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c412-hz-box-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c44-ln-box-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c44-ln-box-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c44-ln-box-002.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c44-ln-box-003.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c526-font-sz-001.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c526-font-sz-002.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c526-font-sz-003.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c534-bgre-000.xht.ini       |  3 ---
 .../meta/css/CSS2/css1/c534-bgre-001.xht.ini       |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-001.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-002.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-003.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-004.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c534-bgreps-005.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c536-bgpos-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c536-bgpos-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c541-word-sp-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c542-letter-sp-000.xht.ini  |  3 ---
 .../meta/css/CSS2/css1/c542-letter-sp-001.xht.ini  |  3 ---
 .../meta/css/CSS2/css1/c544-valgn-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c547-indent-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c548-leadin-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c548-ln-ht-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c548-ln-ht-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c548-ln-ht-002.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c548-ln-ht-003.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c548-ln-ht-004.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5505-mrgn-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c5505-mrgn-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c5505-mrgn-003.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5506-padn-t-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5507-padn-r-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5507-padn-r-001.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5509-padn-l-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5509-padn-l-001.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c5510-padn-001.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c5525-fltblck-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5525-fltinln-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c5526-fltclr-000.xht.ini    |  3 ---
 .../meta/css/CSS2/css1/c562-white-sp-000.xht.ini   |  3 ---
 .../meta/css/CSS2/css1/c61-ex-len-000.xht.ini      |  3 ---
 .../meta/css/CSS2/css1/c61-rel-len-000.xht.ini     |  3 ---
 .../meta/css/CSS2/css1/c62-percent-000.xht.ini     |  3 ---
 .../clear-clearance-calculation-005.xht.ini        |  3 ---
 .../meta/css/CSS2/floats-clear/float-005.xht.ini   |  3 ---
 .../float-non-replaced-width-007.xht.ini           |  3 ---
 .../float-non-replaced-width-008.xht.ini           |  3 ---
 .../float-non-replaced-width-009.xht.ini           |  3 ---
 .../float-non-replaced-width-010.xht.ini           |  3 ---
 .../float-non-replaced-width-011.xht.ini           |  3 ---
 .../float-non-replaced-width-012.xht.ini           |  3 ---
 .../meta/css/CSS2/floats-clear/floats-006.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-009.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-111.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-112.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-113.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-115.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-116.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-117.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-118.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-119.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-120.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-121.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-122.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-123.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-132.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-133.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-134.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-136.xht.ini  |  3 ---
 .../meta/css/CSS2/floats-clear/floats-145.xht.ini  |  3 ---
 .../meta/css/CSS2/fonts/font-011.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-012.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-013.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-014.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-015.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-016.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-029.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-030.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-031.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-032.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-042.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-043.xht.ini           | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-051.xht.ini           |  3 ---
 .../meta/css/CSS2/fonts/font-family-009.xht.ini    |  3 ---
 .../CSS2/fonts/font-family-applies-to-001.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-002.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-005.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-006.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-007.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-008.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-009.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-010.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-011.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-014.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-015.xht.ini  | 13 +++++++++++--
 .../CSS2/fonts/font-family-applies-to-017.xht.ini  | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-size-120.xht.ini      |  3 ---
 .../meta/css/CSS2/fonts/font-size-122.xht.ini      | 13 +++++++++++--
 .../meta/css/CSS2/fonts/font-size-124.xht.ini      |  3 ---
 .../meta/css/CSS2/fonts/fonts-010.xht.ini          |  3 ---
 .../meta/css/CSS2/fonts/fonts-011.xht.ini          |  3 ---
 .../CSS2/linebox/border-padding-bleed-001.xht.ini  |  4 ----
 .../CSS2/linebox/border-padding-bleed-002.xht.ini  |  4 ----
 .../CSS2/linebox/border-padding-bleed-003.xht.ini  |  4 ----
 .../linebox/inline-formatting-context-008.xht.ini  |  4 ----
 .../linebox/inline-formatting-context-009.xht.ini  |  4 ----
 .../linebox/inline-formatting-context-011.xht.ini  |  4 ----
 .../linebox/inline-formatting-context-013.xht.ini  |  4 ----
 .../linebox/inline-formatting-context-022.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/leading-001.xht.ini      |  4 ----
 .../meta/css/CSS2/linebox/line-height-002.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-004.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-005.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-006.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-007.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-013.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-015.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-016.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-017.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-018.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-024.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-025.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-026.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-027.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-028.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-029.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-035.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-037.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-038.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-039.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-040.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-046.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-048.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-049.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-050.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-051.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-057.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-058.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-059.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-060.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-061.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-062.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-068.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-069.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-070.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-071.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-072.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-073.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-079.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-080.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-081.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-082.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-083.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-084.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-090.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-092.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-093.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-094.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-095.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-101.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-102.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-103.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-104.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-105.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-106.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-112.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-121.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-127.xht.ini  |  4 ----
 .../meta/css/CSS2/linebox/line-height-128.xht.ini  |  4 ----
 .../css/CSS2/linebox/line-height-bleed-002.xht.ini |  4 ----
 .../css/CSS2/linebox/vertical-align-004.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-005.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-006.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-007.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-008.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-016.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-017.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-018.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-019.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-020.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-028.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-029.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-030.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-031.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-032.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-040.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-041.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-042.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-043.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-044.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-052.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-053.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-054.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-055.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-056.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-064.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-065.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-066.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-067.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-068.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-076.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-077.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-078.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-079.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-080.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-088.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-089.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-090.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-091.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-092.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-100.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-101.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-102.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-103.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-104.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-109.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-110.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-111.xht.ini    |  4 ----
 .../css/CSS2/linebox/vertical-align-117a.xht.ini   |  4 ----
 .../css/CSS2/linebox/vertical-align-118a.xht.ini   |  4 ----
 .../css/CSS2/linebox/vertical-align-121.xht.ini    |  4 ----
 .../linebox/vertical-align-applies-to-001.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-002.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-003.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-004.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-005.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-006.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-007.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-008.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-009.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-012.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-013.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-014.xht.ini  |  4 ----
 .../linebox/vertical-align-applies-to-015.xht.ini  |  4 ----
 .../linebox/vertical-align-baseline-001.xht.ini    |  4 ----
 .../linebox/vertical-align-baseline-002.xht.ini    |  4 ----
 .../linebox/vertical-align-baseline-004a.xht.ini   | 12 +++++++-----
 .../linebox/vertical-align-baseline-005a.xht.ini   | 12 +++++++-----
 .../margin-border-padding-001.xht.ini              |  3 ---
 .../margin-padding-clear/margin-bottom-091.xht.ini |  3 ---
 .../margin-padding-clear/margin-bottom-092.xht.ini |  3 ---
 .../margin-bottom-applies-to-008.xht.ini           |  3 ---
 .../margin-collapse-106.xht.ini                    |  3 ---
 .../margin-collapse-130.xht.ini                    |  3 ---
 .../margin-collapse-131.xht.ini                    |  3 ---
 .../margin-collapse-137.xht.ini                    |  3 ---
 .../margin-collapse-138.xht.ini                    |  3 ---
 .../margin-collapse-155.xht.ini                    |  3 ---
 .../margin-padding-clear/margin-inline-001.xht.ini |  3 ---
 .../margin-padding-clear/margin-left-091.xht.ini   |  3 ---
 .../margin-padding-clear/margin-left-092.xht.ini   |  3 ---
 .../margin-padding-clear/margin-right-091.xht.ini  |  3 ---
 .../margin-padding-clear/margin-right-092.xht.ini  |  3 ---
 .../margin-padding-clear/margin-top-091.xht.ini    |  3 ---
 .../margin-padding-clear/margin-top-092.xht.ini    |  3 ---
 .../margin-top-applies-to-008.xht.ini              |  3 ---
 .../padding-bottom-080.xht.ini                     |  3 ---
 .../padding-bottom-083.xht.ini                     |  3 ---
 .../padding-bottom-084.xht.ini                     |  3 ---
 .../margin-padding-clear/padding-left-080.xht.ini  |  3 ---
 .../margin-padding-clear/padding-left-083.xht.ini  |  3 ---
 .../margin-padding-clear/padding-left-084.xht.ini  |  3 ---
 .../margin-padding-clear/padding-right-080.xht.ini |  3 ---
 .../margin-padding-clear/padding-right-083.xht.ini |  3 ---
 .../margin-padding-clear/padding-right-084.xht.ini |  3 ---
 .../margin-padding-clear/padding-top-080.xht.ini   |  3 ---
 .../margin-padding-clear/padding-top-083.xht.ini   |  3 ---
 .../margin-padding-clear/padding-top-084.xht.ini   |  3 ---
 .../block-formatting-contexts-004.xht.ini          |  3 ---
 .../block-non-replaced-height-005.xht.ini          |  3 ---
 .../block-non-replaced-width-007.xht.ini           |  3 ---
 .../normal-flow/block-replaced-width-006.xht.ini   |  3 ---
 .../meta/css/CSS2/normal-flow/blocks-017.xht.ini   |  3 ---
 .../meta/css/CSS2/normal-flow/height-080.xht.ini   |  3 ---
 .../meta/css/CSS2/normal-flow/height-083.xht.ini   |  3 ---
 .../meta/css/CSS2/normal-flow/height-084.xht.ini   |  3 ---
 .../inline-block-non-replaced-width-001.xht.ini    |  3 ---
 .../inline-block-non-replaced-width-002.xht.ini    |  3 ---
 .../inline-block-non-replaced-width-003.xht.ini    |  3 ---
 .../inline-block-non-replaced-width-004.xht.ini    |  3 ---
 .../inline-non-replaced-height-002.xht.ini         |  3 ---
 .../inline-non-replaced-height-003.xht.ini         |  3 ---
 .../inline-non-replaced-width-001.xht.ini          |  3 ---
 .../inline-non-replaced-width-002.xht.ini          |  3 ---
 .../meta/css/CSS2/normal-flow/inlines-016.xht.ini  |  3 ---
 .../meta/css/CSS2/normal-flow/inlines-017.xht.ini  |  3 ---
 .../css/CSS2/normal-flow/max-height-080.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/max-height-083.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/max-height-084.xht.ini    |  3 ---
 .../normal-flow/max-height-applies-to-008.xht.ini  |  3 ---
 .../css/CSS2/normal-flow/max-width-080.xht.ini     |  3 ---
 .../css/CSS2/normal-flow/max-width-083.xht.ini     |  3 ---
 .../css/CSS2/normal-flow/max-width-084.xht.ini     |  3 ---
 .../css/CSS2/normal-flow/max-width-107.xht.ini     |  3 ---
 .../normal-flow/max-width-applies-to-008.xht.ini   |  3 ---
 .../css/CSS2/normal-flow/min-height-067.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-068.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-070.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-071.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-078.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-079.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-080.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-081.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-082.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-083.xht.ini    |  3 ---
 .../css/CSS2/normal-flow/min-height-084.xht.ini    |  3 ---
 .../normal-flow/min-height-applies-to-008.xht.ini  |  3 ---
 .../css/CSS2/normal-flow/min-width-080.xht.ini     |  3 ---
 .../css/CSS2/normal-flow/min-width-083.xht.ini     |  3 ---
 .../css/CSS2/normal-flow/min-width-084.xht.ini     |  3 ---
 .../normal-flow/min-width-applies-to-008.xht.ini   |  3 ---
 .../meta/css/CSS2/normal-flow/width-080.xht.ini    |  3 ---
 .../meta/css/CSS2/normal-flow/width-083.xht.ini    |  3 ---
 .../meta/css/CSS2/normal-flow/width-084.xht.ini    |  3 ---
 .../absolute-non-replaced-height-002.xht.ini       |  3 ---
 .../absolute-non-replaced-height-007.xht.ini       |  3 ---
 .../absolute-non-replaced-height-009.xht.ini       |  3 ---
 .../absolute-non-replaced-max-height-002.xht.ini   |  3 ---
 .../absolute-non-replaced-width-001.xht.ini        |  3 ---
 .../absolute-non-replaced-width-002.xht.ini        |  3 ---
 .../absolute-non-replaced-width-003.xht.ini        |  3 ---
 .../absolute-non-replaced-width-004.xht.ini        |  3 ---
 .../absolute-non-replaced-width-005.xht.ini        |  3 ---
 .../absolute-non-replaced-width-006.xht.ini        |  3 ---
 .../absolute-non-replaced-width-007.xht.ini        |  3 ---
 .../absolute-non-replaced-width-008.xht.ini        |  3 ---
 .../absolute-non-replaced-width-010.xht.ini        |  3 ---
 .../absolute-non-replaced-width-011.xht.ini        |  3 ---
 .../absolute-non-replaced-width-012.xht.ini        |  3 ---
 .../absolute-non-replaced-width-013.xht.ini        |  3 ---
 .../absolute-non-replaced-width-014.xht.ini        |  3 ---
 .../absolute-non-replaced-width-016.xht.ini        |  3 ---
 .../absolute-non-replaced-width-017.xht.ini        |  3 ---
 .../absolute-non-replaced-width-018.xht.ini        |  3 ---
 .../absolute-non-replaced-width-019.xht.ini        |  3 ---
 .../absolute-non-replaced-width-020.xht.ini        |  3 ---
 .../absolute-non-replaced-width-021.xht.ini        |  3 ---
 .../absolute-non-replaced-width-022.xht.ini        |  3 ---
 .../absolute-non-replaced-width-023.xht.ini        |  3 ---
 .../absolute-non-replaced-width-024.xht.ini        |  3 ---
 .../meta/css/CSS2/positioning/bottom-091.xht.ini   |  3 ---
 .../meta/css/CSS2/positioning/bottom-092.xht.ini   |  3 ---
 .../meta/css/CSS2/positioning/left-091.xht.ini     |  3 ---
 .../meta/css/CSS2/positioning/left-092.xht.ini     |  3 ---
 .../CSS2/positioning/position-relative-033.xht.ini |  3 ---
 .../meta/css/CSS2/positioning/right-091.xht.ini    |  3 ---
 .../meta/css/CSS2/positioning/right-092.xht.ini    |  3 ---
 .../meta/css/CSS2/positioning/top-091.xht.ini      |  3 ---
 .../meta/css/CSS2/positioning/top-092.xht.ini      |  3 ---
 .../CSS2/selectors/first-line-pseudo-012.xht.ini   |  4 ----
 .../CSS2/selectors/first-line-pseudo-013.xht.ini   |  4 ----
 .../CSS2/selectors/first-line-pseudo-014.xht.ini   |  4 ----
 .../CSS2/selectors/first-line-pseudo-015.xht.ini   |  4 ----
 .../CSS2/selectors/first-line-pseudo-016.xht.ini   |  4 ----
 .../tables/collapsing-border-model-010a.xht.ini    |  3 ---
 .../tables/collapsing-border-model-010b.xht.ini    |  3 ---
 .../tables/table-height-algorithm-008a.xht.ini     |  3 ---
 .../tables/table-height-algorithm-008b.xht.ini     |  3 ---
 .../tables/table-height-algorithm-008c.xht.ini     |  3 ---
 .../meta/css/CSS2/tables/table-margin-004.xht.ini  |  3 ---
 .../text/letter-spacing-applies-to-001.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-002.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-006.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-008.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-009.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-010.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-011.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-014.xht.ini     |  4 ----
 .../text/letter-spacing-applies-to-015.xht.ini     |  4 ----
 .../CSS2/text/painting-order-underline-001.xht.ini |  4 ----
 .../meta/css/CSS2/text/text-align-bidi-011.xht.ini |  4 ----
 .../CSS2/text/text-align-white-space-001.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-002.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-003.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-004.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-005.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-006.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-007.xht.ini   |  4 ----
 .../CSS2/text/text-align-white-space-008.xht.ini   |  4 ----
 .../meta/css/CSS2/text/text-indent-007.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-008.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-012.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-019.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-020.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-031.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-032.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-043.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-044.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-055.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-056.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-067.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-068.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-079.xht.ini     |  4 ----
 .../meta/css/CSS2/text/text-indent-080.xht.ini     |  4 ----
 .../CSS2/text/white-space-collapsing-001.xht.ini   |  4 ----
 .../CSS2/text/white-space-collapsing-002.xht.ini   |  4 ----
 .../CSS2/text/white-space-collapsing-004.xht.ini   |  4 ----
 .../CSS2/text/white-space-collapsing-005.xht.ini   |  4 ----
 .../text/white-space-collapsing-bidi-002.xht.ini   |  4 ----
 .../text/white-space-collapsing-bidi-003.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-mixed-002.xht.ini    |  4 ----
 .../css/CSS2/text/white-space-normal-001.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-002.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-003.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-004.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-005.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-006.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-007.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-008.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-normal-009.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-nowrap-001.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-nowrap-005.xht.ini   |  4 ----
 .../css/CSS2/text/white-space-nowrap-006.xht.ini   |  4 ----
 .../meta/css/CSS2/text/white-space-pre-001.xht.ini |  4 ----
 .../meta/css/CSS2/text/white-space-pre-002.xht.ini |  4 ----
 .../meta/css/CSS2/text/white-space-pre-005.xht.ini |  4 ----
 .../meta/css/CSS2/text/white-space-pre-006.xht.ini |  4 ----
 .../CSS2/text/white-space-processing-049.xht.ini   |  4 ----
 .../css/CSS2/ui/overflow-applies-to-001.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-002.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-003.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-004.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-005.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-006.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-007.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-008.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-009.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-012.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-013.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-014.xht.ini    |  4 ----
 .../css/CSS2/ui/overflow-applies-to-015.xht.ini    |  4 ----
 .../meta/css/CSS2/values/numbers-units-007.xht.ini | 13 +++++++++++--
 .../meta/css/CSS2/values/numbers-units-009.xht.ini | 13 +++++++++++--
 .../meta/css/CSS2/values/numbers-units-010.xht.ini | 13 +++++++++++--
 .../meta/css/CSS2/values/numbers-units-012.xht.ini |  3 ---
 .../meta/css/CSS2/values/numbers-units-013.xht.ini |  3 ---
 .../meta/css/CSS2/values/numbers-units-015.xht.ini |  3 ---
 .../meta/css/CSS2/values/numbers-units-018.xht.ini |  3 ---
 .../meta/css/CSS2/values/numbers-units-019.xht.ini |  3 ---
 .../meta/css/CSS2/values/numbers-units-021.xht.ini | 13 +++++++++++--
 .../meta/css/CSS2/values/units-001.xht.ini         |  3 ---
 .../meta/css/CSS2/values/units-003.xht.ini         |  3 ---
 .../meta/css/CSS2/values/units-004.xht.ini         |  3 ---
 .../meta/css/CSS2/values/units-006.xht.ini         |  3 ---
 .../meta/css/CSS2/values/units-008.xht.ini         |  3 ---
 .../meta/css/CSS2/values/units-009.xht.ini         |  3 ---
 .../meta/css/CSS2/visufx/visibility-005.xht.ini    |  4 ----
 .../css/CSS2/visuren/anonymous-boxes-001a.xht.ini  |  3 ---
 .../meta/css/CSS2/zindex/stack-floats-001.xht.ini  |  4 ----
 .../meta/css/CSS2/zindex/stack-floats-002.xht.ini  |  4 ----
 .../meta/css/CSS2/zindex/stack-floats-003.xht.ini  |  4 ----
 .../meta/css/CSS2/zindex/stack-floats-004.xht.ini  |  4 ----
 .../css/css-contain/contain-layout-002.html.ini    |  3 ---
 .../css/css-contain/contain-layout-003.html.ini    |  3 ---
 .../css/css-contain/contain-layout-004.html.ini    |  3 ---
 .../css/css-contain/contain-layout-009.html.ini    |  3 ---
 .../css/css-contain/contain-layout-010.html.ini    |  3 ---
 .../css/css-contain/contain-layout-011.html.ini    |  3 ---
 .../css/css-contain/contain-layout-012.html.ini    |  3 ---
 .../css/css-contain/contain-layout-018.html.ini    |  2 ++
 .../css/css-contain/contain-paint-022.html.ini     |  3 ---
 .../css/css-contain/contain-paint-023.html.ini     |  3 ---
 .../css-contain/contain-size-breaks-001.html.ini   |  3 ---
 .../run-in/letter-spacing-applies-to-004.xht.ini   |  4 ----
 .../meta/css/css-flexbox/align-items-004.htm.ini   |  4 ----
 .../meta/css/css-flexbox/align-items-006.html.ini  |  4 ----
 .../flex-minimum-width-flex-items-001.xht.ini      |  4 ----
 .../flex-minimum-width-flex-items-003.xht.ini      |  4 ----
 .../flexbox_flex-natural-mixed-basis-auto.html.ini |  4 ----
 .../css/css-fonts/font-size-adjust-002.html.ini    |  4 ----
 .../css/css-fonts/font-size-adjust-006.xht.ini     |  4 ----
 .../css/css-fonts/font-size-adjust-007.xht.ini     |  4 ----
 .../css/css-fonts/font-size-adjust-008.xht.ini     |  4 ----
 ...lf-baseline-changes-grid-area-size-001.html.ini |  3 ---
 ...lf-baseline-changes-grid-area-size-004.html.ini |  3 ---
 ...lf-baseline-changes-grid-area-size-005.html.ini |  3 ---
 .../grid-template-columns-fit-content-001.html.ini |  4 ----
 .../grid-template-rows-fit-content-001.html.ini    |  4 ----
 .../grid-items/grid-inline-items-001.html.ini      |  4 ----
 .../grid-items/grid-inline-items-002.html.ini      |  4 ----
 .../grid-items/grid-inline-items-003.html.ini      |  4 ----
 ...line-order-property-auto-placement-001.html.ini |  4 ----
 ...line-order-property-auto-placement-002.html.ini |  4 ----
 ...line-order-property-auto-placement-003.html.ini |  4 ----
 ...line-order-property-auto-placement-004.html.ini |  4 ----
 ...line-order-property-auto-placement-005.html.ini |  4 ----
 ...rid-inline-order-property-painting-001.html.ini |  4 ----
 ...rid-inline-order-property-painting-002.html.ini |  4 ----
 ...rid-inline-order-property-painting-003.html.ini |  4 ----
 ...rid-inline-order-property-painting-004.html.ini |  4 ----
 ...rid-inline-order-property-painting-005.html.ini |  4 ----
 .../grid-inline-z-axis-ordering-001.html.ini       |  4 ----
 .../grid-inline-z-axis-ordering-002.html.ini       |  4 ----
 .../grid-inline-z-axis-ordering-003.html.ini       |  4 ----
 .../grid-inline-z-axis-ordering-004.html.ini       |  4 ----
 .../grid-inline-z-axis-ordering-005.html.ini       |  4 ----
 ...e-z-axis-ordering-overlapped-items-001.html.ini |  4 ----
 ...e-z-axis-ordering-overlapped-items-002.html.ini |  4 ----
 ...e-z-axis-ordering-overlapped-items-003.html.ini |  4 ----
 ...e-z-axis-ordering-overlapped-items-004.html.ini |  4 ----
 ...e-z-axis-ordering-overlapped-items-005.html.ini |  4 ----
 ...e-z-axis-ordering-overlapped-items-006.html.ini |  4 ----
 .../css-grid/grid-items/grid-items-001.html.ini    |  4 ----
 .../css-grid/grid-items/grid-items-002.html.ini    |  4 ----
 .../css-grid/grid-items/grid-items-003.html.ini    |  4 ----
 .../grid-minimum-size-grid-items-001.html.ini      |  4 ----
 .../grid-minimum-size-grid-items-013.html.ini      |  4 ----
 ...grid-order-property-auto-placement-001.html.ini |  4 ----
 ...grid-order-property-auto-placement-002.html.ini |  4 ----
 ...grid-order-property-auto-placement-003.html.ini |  4 ----
 ...grid-order-property-auto-placement-004.html.ini |  4 ----
 ...grid-order-property-auto-placement-005.html.ini |  4 ----
 .../grid-order-property-painting-001.html.ini      |  4 ----
 .../grid-order-property-painting-002.html.ini      |  4 ----
 .../grid-order-property-painting-003.html.ini      |  4 ----
 .../grid-order-property-painting-004.html.ini      |  4 ----
 .../grid-order-property-painting-005.html.ini      |  4 ----
 .../grid-items/grid-z-axis-ordering-001.html.ini   |  4 ----
 .../grid-items/grid-z-axis-ordering-002.html.ini   |  4 ----
 .../grid-items/grid-z-axis-ordering-003.html.ini   |  4 ----
 .../grid-items/grid-z-axis-ordering-004.html.ini   |  4 ----
 .../grid-items/grid-z-axis-ordering-005.html.ini   |  4 ----
 ...d-z-axis-ordering-overlapped-items-001.html.ini |  4 ----
 ...d-z-axis-ordering-overlapped-items-002.html.ini |  4 ----
 ...d-z-axis-ordering-overlapped-items-003.html.ini |  4 ----
 ...d-z-axis-ordering-overlapped-items-004.html.ini |  4 ----
 ...d-z-axis-ordering-overlapped-items-005.html.ini |  4 ----
 ...d-z-axis-ordering-overlapped-items-006.html.ini |  4 ----
 .../grid-model/grid-display-grid-001.html.ini      |  4 ----
 .../grid-inline-vertical-align-001.html.ini        |  4 ----
 .../grid-model/grid-vertical-align-001.html.ini    |  4 ----
 ...rid-percent-cols-filled-shrinkwrap-001.html.ini |  4 ----
 ...id-percent-cols-spanned-shrinkwrap-001.html.ini |  4 ----
 .../css/css-multicol/multicol-basic-001.html.ini   |  3 ---
 .../css/css-multicol/multicol-basic-002.html.ini   |  3 ---
 .../css/css-multicol/multicol-basic-003.html.ini   |  3 ---
 .../css/css-multicol/multicol-basic-004.html.ini   |  3 ---
 .../multicol-block-no-clip-001.xht.ini             |  3 ---
 .../multicol-block-no-clip-002.xht.ini             |  3 ---
 .../css/css-multicol/multicol-clip-001.xht.ini     |  3 ---
 .../css/css-multicol/multicol-clip-002.xht.ini     |  3 ---
 .../css-multicol/multicol-collapsing-001.xht.ini   |  3 ---
 .../css/css-multicol/multicol-columns-001.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-002.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-003.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-004.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-005.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-006.xht.ini  |  3 ---
 .../css/css-multicol/multicol-columns-007.xht.ini  |  3 ---
 .../multicol-columns-invalid-001.xht.ini           |  3 ---
 .../multicol-columns-invalid-002.xht.ini           |  3 ---
 .../multicol-columns-toolong-001.xht.ini           |  3 ---
 .../css-multicol/multicol-containing-001.xht.ini   |  3 ---
 .../css-multicol/multicol-containing-002.xht.ini   |  3 ---
 .../css/css-multicol/multicol-count-001.xht.ini    |  3 ---
 .../css/css-multicol/multicol-count-002.xht.ini    |  3 ---
 .../multicol-count-computed-003.xht.ini            |  3 ---
 .../multicol-count-computed-004.xht.ini            |  3 ---
 .../multicol-count-computed-005.xht.ini            |  3 ---
 .../multicol-count-negative-001.xht.ini            |  3 ---
 .../multicol-count-negative-002.xht.ini            |  3 ---
 .../multicol-count-non-integer-001.xht.ini         |  3 ---
 .../multicol-count-non-integer-002.xht.ini         |  3 ---
 .../multicol-count-non-integer-003.xht.ini         |  3 ---
 .../css/css-multicol/multicol-fill-000.xht.ini     |  3 ---
 .../css/css-multicol/multicol-fill-001.xht.ini     |  3 ---
 .../css-multicol/multicol-fill-auto-002.xht.ini    |  3 ---
 .../css-multicol/multicol-fill-auto-003.xht.ini    |  3 ---
 .../css-multicol/multicol-fill-balance-001.xht.ini |  3 ---
 .../meta/css/css-multicol/multicol-gap-000.xht.ini |  3 ---
 .../meta/css/css-multicol/multicol-gap-001.xht.ini |  3 ---
 .../meta/css/css-multicol/multicol-gap-002.xht.ini |  3 ---
 .../meta/css/css-multicol/multicol-gap-003.xht.ini |  3 ---
 .../css-multicol/multicol-gap-fraction-001.xht.ini |  3 ---
 .../css-multicol/multicol-gap-large-001.xht.ini    |  3 ---
 .../css-multicol/multicol-gap-large-002.xht.ini    |  3 ---
 .../css-multicol/multicol-gap-negative-001.xht.ini |  3 ---
 .../css/css-multicol/multicol-height-001.xht.ini   |  3 ---
 .../css/css-multicol/multicol-inherit-002.xht.ini  |  3 ---
 .../css/css-multicol/multicol-inherit-003.xht.ini  |  3 ---
 .../css/css-multicol/multicol-margin-001.xht.ini   |  3 ---
 .../css/css-multicol/multicol-margin-002.xht.ini   |  3 ---
 .../css-multicol/multicol-margin-child-001.xht.ini |  3 ---
 .../css/css-multicol/multicol-nested-002.xht.ini   |  3 ---
 .../css/css-multicol/multicol-nested-005.xht.ini   |  3 ---
 .../multicol-nested-margin-001.xht.ini             |  3 ---
 .../multicol-nested-margin-002.xht.ini             |  3 ---
 .../multicol-nested-margin-003.xht.ini             |  3 ---
 .../multicol-nested-margin-004.xht.ini             |  3 ---
 .../multicol-nested-margin-005.xht.ini             |  3 ---
 .../css-multicol/multicol-overflowing-001.xht.ini  |  3 ---
 .../css/css-multicol/multicol-reduce-000.xht.ini   |  3 ---
 .../css/css-multicol/multicol-rule-000.xht.ini     |  3 ---
 .../css/css-multicol/multicol-rule-001.xht.ini     |  3 ---
 .../css/css-multicol/multicol-rule-002.xht.ini     |  3 ---
 .../css/css-multicol/multicol-rule-003.xht.ini     |  3 ---
 .../css-multicol/multicol-rule-color-001.xht.ini   |  3 ---
 .../multicol-rule-color-inherit-001.xht.ini        |  3 ---
 .../multicol-rule-color-inherit-002.xht.ini        |  3 ---
 .../css-multicol/multicol-rule-dashed-000.xht.ini  |  3 ---
 .../css-multicol/multicol-rule-dotted-000.xht.ini  |  3 ---
 .../css-multicol/multicol-rule-double-000.xht.ini  |  3 ---
 .../multicol-rule-fraction-001.xht.ini             |  3 ---
 .../multicol-rule-fraction-002.xht.ini             |  3 ---
 .../multicol-rule-fraction-003.xht.ini             |  3 ---
 .../css-multicol/multicol-rule-groove-000.xht.ini  |  3 ---
 .../css-multicol/multicol-rule-inset-000.xht.ini   |  3 ---
 .../css-multicol/multicol-rule-large-001.xht.ini   |  3 ---
 .../css-multicol/multicol-rule-outset-000.xht.ini  |  3 ---
 .../css-multicol/multicol-rule-percent-001.xht.ini |  3 ---
 .../css/css-multicol/multicol-rule-px-001.xht.ini  |  3 ---
 .../css-multicol/multicol-rule-ridge-000.xht.ini   |  3 ---
 .../css-multicol/multicol-rule-shorthand-2.xht.ini |  3 ---
 .../css-multicol/multicol-rule-solid-000.xht.ini   |  3 ---
 .../multicol-rule-stacking-001.xht.ini             |  3 ---
 .../css-multicol/multicol-shorthand-001.xht.ini    |  3 ---
 .../css-multicol/multicol-span-none-001.xht.ini    |  3 ---
 .../css/css-multicol/multicol-width-001.xht.ini    |  3 ---
 .../css/css-multicol/multicol-width-002.xht.ini    |  3 ---
 .../css-multicol/multicol-width-count-001.xht.ini  |  3 ---
 .../css-multicol/multicol-width-count-002.xht.ini  |  3 ---
 .../multicol-width-invalid-001.xht.ini             |  3 ---
 .../css-multicol/multicol-width-large-001.xht.ini  |  3 ---
 .../css-multicol/multicol-width-large-002.xht.ini  |  3 ---
 .../multicol-width-negative-001.xht.ini            |  3 ---
 .../css-position/position-sticky-inline.html.ini   |  3 ---
 .../position-sticky-nested-inline.html.ini         |  3 ---
 .../css-pseudo/marker-inherit-line-height.html.ini |  1 +
 .../resizing/regions-resizing-002.html.ini         |  4 ----
 .../resizing/regions-resizing-004.html.ini         |  4 ----
 .../shape-box/shape-outside-box-002.html.ini       |  4 ----
 .../shape-box/shape-outside-box-003.html.ini       |  4 ----
 .../shape-box/shape-outside-box-004.html.ini       |  4 ----
 .../shape-box/shape-outside-box-006.html.ini       |  4 ----
 .../shape-box/shape-outside-box-007.html.ini       |  4 ----
 .../shape-box/shape-outside-box-008.html.ini       |  4 ----
 .../shape-box/shape-outside-box-009.html.ini       |  4 ----
 .../shape-image/shape-image-000.html.ini           |  4 ----
 .../shape-image/shape-image-001.html.ini           |  4 ----
 .../shape-image/shape-image-002.html.ini           |  4 ----
 .../shape-image/shape-image-003.html.ini           |  4 ----
 .../shape-image/shape-image-004.html.ini           |  4 ----
 .../shape-image/shape-image-005.html.ini           |  4 ----
 .../shape-image/shape-image-006.html.ini           |  4 ----
 .../shape-image/shape-image-007.html.ini           |  4 ----
 .../shape-image/shape-image-008.html.ini           |  4 ----
 .../shape-image/shape-image-009.html.ini           |  4 ----
 .../shape-image/shape-image-010.html.ini           |  4 ----
 .../shape-image/shape-image-011.html.ini           |  4 ----
 .../shape-image/shape-image-012.html.ini           |  4 ----
 .../shape-image/shape-image-013.html.ini           |  4 ----
 .../shape-image/shape-image-014.html.ini           |  4 ----
 .../shape-image/shape-image-015.html.ini           |  4 ----
 .../shape-image/shape-image-016.html.ini           |  4 ----
 .../shape-image/shape-image-017.html.ini           |  4 ----
 .../shape-image/shape-image-018.html.ini           |  4 ----
 .../shape-image/shape-image-019.html.ini           |  4 ----
 .../shape-image/shape-image-020.html.ini           |  4 ----
 .../shape-image/shape-image-021.html.ini           |  4 ----
 .../shape-image/shape-image-022.html.ini           |  4 ----
 .../shape-image/shape-image-023.html.ini           |  4 ----
 .../shape-image/shape-image-025.html.ini           |  4 ----
 .../shape-image/shape-image-026.html.ini           |  4 ----
 .../shape-image/shape-image-027.html.ini           |  4 ----
 .../circle/shape-outside-circle-013.html.ini       |  4 ----
 .../circle/shape-outside-circle-014.html.ini       |  4 ----
 .../circle/shape-outside-circle-015.html.ini       |  4 ----
 .../circle/shape-outside-circle-016.html.ini       |  4 ----
 .../circle/shape-outside-circle-017.html.ini       |  4 ----
 .../circle/shape-outside-circle-018.html.ini       |  4 ----
 .../circle/shape-outside-circle-019.html.ini       |  4 ----
 .../circle/shape-outside-circle-020.html.ini       |  4 ----
 .../circle/shape-outside-circle-021.html.ini       |  4 ----
 .../circle/shape-outside-circle-022.html.ini       |  4 ----
 .../circle/shape-outside-circle-024.html.ini       |  4 ----
 .../circle/shape-outside-circle-025.html.ini       |  4 ----
 .../circle/shape-outside-circle-026.html.ini       |  4 ----
 .../circle/shape-outside-circle-027.html.ini       |  4 ----
 .../circle/shape-outside-circle-028.html.ini       |  4 ----
 .../circle/shape-outside-circle-029.html.ini       |  4 ----
 .../ellipse/shape-outside-ellipse-013.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-014.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-015.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-016.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-017.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-018.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-019.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-020.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-021.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-022.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-023.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-024.html.ini     |  4 ----
 .../ellipse/shape-outside-ellipse-025.html.ini     |  4 ----
 .../inset/shape-outside-inset-010.html.ini         |  4 ----
 .../inset/shape-outside-inset-011.html.ini         |  4 ----
 .../inset/shape-outside-inset-012.html.ini         |  4 ----
 .../inset/shape-outside-inset-013.html.ini         |  4 ----
 .../inset/shape-outside-inset-014.html.ini         |  4 ----
 .../inset/shape-outside-inset-015.html.ini         |  4 ----
 .../inset/shape-outside-inset-028.html.ini         |  4 ----
 .../inset/shape-outside-inset-029.html.ini         |  4 ----
 .../inset/shape-outside-inset-030.html.ini         |  4 ----
 .../polygon/shape-outside-polygon-007.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-008.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-009.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-010.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-011.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-012.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-013.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-014.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-015.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-016.html.ini     |  4 ----
 .../polygon/shape-outside-polygon-017.html.ini     |  4 ----
 .../spec-examples/shape-outside-001.html.ini       |  4 ----
 .../spec-examples/shape-outside-002.html.ini       |  4 ----
 .../spec-examples/shape-outside-003.html.ini       |  4 ----
 .../spec-examples/shape-outside-005.html.ini       |  4 ----
 .../spec-examples/shape-outside-006.html.ini       |  4 ----
 .../spec-examples/shape-outside-007.html.ini       |  4 ----
 .../intrinsic-percent-non-replaced-001.html.ini    |  3 ---
 .../intrinsic-percent-non-replaced-003.html.ini    |  3 ---
 .../line-breaking/line-breaking-001.html.ini       |  4 ----
 .../line-breaking/line-breaking-002.html.ini       |  4 ----
 .../line-breaking/line-breaking-003.html.ini       |  4 ----
 .../line-breaking/line-breaking-004.html.ini       |  4 ----
 .../line-breaking/line-breaking-005.html.ini       |  4 ----
 .../line-breaking/line-breaking-006.html.ini       |  4 ----
 .../line-breaking/line-breaking-007.html.ini       |  4 ----
 .../line-breaking/line-breaking-008.html.ini       |  4 ----
 .../line-breaking/line-breaking-009.html.ini       |  4 ----
 .../line-breaking/line-breaking-010.html.ini       |  4 ----
 .../line-breaking/line-breaking-011.html.ini       |  4 ----
 .../line-breaking/line-breaking-012.html.ini       |  4 ----
 .../overflow-wrap/overflow-wrap-001.html.ini       |  3 ---
 .../overflow-wrap/overflow-wrap-002.html.ini       |  3 ---
 .../overflow-wrap/overflow-wrap-003.html.ini       |  3 ---
 .../overflow-wrap/overflow-wrap-005.html.ini       |  3 ---
 .../css-text/overflow-wrap/word-wrap-001.html.ini  |  3 ---
 .../css-text/overflow-wrap/word-wrap-002.html.ini  |  3 ---
 .../css-text/overflow-wrap/word-wrap-003.html.ini  |  3 ---
 .../css-text/overflow-wrap/word-wrap-005.html.ini  |  3 ---
 .../css-text/white-space/break-spaces-002.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-001.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-002.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-003.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-004.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-005.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-006.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-007.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-011.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-012.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-013.html.ini |  4 ----
 .../css/css-text/white-space/pre-wrap-014.html.ini |  4 ----
 .../white-space/textarea-break-spaces-002.html.ini |  4 ----
 .../white-space/textarea-pre-wrap-001.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-002.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-003.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-004.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-005.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-006.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-007.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-011.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-012.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-013.html.ini     |  4 ----
 .../white-space/textarea-pre-wrap-014.html.ini     |  4 ----
 .../transform-applies-to-002.xht.ini               |  3 ---
 .../meta/css/css-ui/outline-004.html.ini           |  4 ----
 .../meta/css/css-ui/text-overflow-001.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-002.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-003.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-004.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-007.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-010.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-011.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-013.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-014.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-015.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-016.html.ini     |  4 ----
 .../meta/css/css-ui/text-overflow-020.html.ini     |  4 ----
 .../css-variables/vars-font-shorthand-001.html.ini |  4 ----
 .../abs-pos-non-replaced-vlr-003.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-005.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-009.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-011.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-015.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-017.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-021.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-023.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-027.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-029.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-033.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-035.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-039.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-041.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-045.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-047.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-051.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-053.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-057.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-059.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-063.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-065.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-069.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-071.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-075.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-077.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-081.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-083.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-087.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-089.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-093.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-095.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-103.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-105.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-109.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-111.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-113.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-117.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-119.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-121.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-125.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-127.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-129.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-133.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-135.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-137.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-141.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-143.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-145.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-149.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-151.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-153.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-157.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-159.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-161.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-165.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-167.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-169.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-173.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-175.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-177.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-181.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-183.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-185.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-189.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-191.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-193.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-197.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-199.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-201.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-205.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-207.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-209.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-213.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-215.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-217.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-221.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-223.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-225.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vlr-229.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-002.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-004.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-008.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-010.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-014.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-016.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-020.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-022.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-026.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-028.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-032.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-034.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-038.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-040.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-044.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-046.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-050.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-052.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-056.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-058.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-062.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-064.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-068.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-070.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-074.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-076.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-080.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-082.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-086.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-088.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-092.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-094.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-102.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-104.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-108.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-110.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-112.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-116.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-118.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-120.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-124.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-126.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-128.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-132.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-134.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-136.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-140.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-142.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-144.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-148.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-150.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-152.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-156.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-158.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-160.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-164.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-166.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-168.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-172.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-174.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-176.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-180.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-182.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-184.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-188.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-190.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-192.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-196.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-198.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-200.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-204.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-206.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-208.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-212.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-214.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-216.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-220.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-222.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-224.xht.ini           |  4 ----
 .../abs-pos-non-replaced-vrl-228.xht.ini           |  4 ----
 .../block-flow-direction-004.xht.ini               |  4 ----
 .../block-flow-direction-htb-001.xht.ini           |  4 ----
 .../block-flow-direction-slr-043.xht.ini           |  4 ----
 .../block-flow-direction-slr-047.xht.ini           |  4 ----
 .../block-flow-direction-slr-048.xht.ini           |  4 ----
 .../block-flow-direction-slr-050.xht.ini           |  4 ----
 .../block-flow-direction-slr-054.xht.ini           |  4 ----
 .../block-flow-direction-slr-055.xht.ini           |  4 ----
 .../block-flow-direction-slr-056.xht.ini           |  4 ----
 .../block-flow-direction-slr-060.xht.ini           |  4 ----
 .../block-flow-direction-slr-062.xht.ini           |  4 ----
 .../block-flow-direction-slr-063.xht.ini           |  4 ----
 .../block-flow-direction-srl-042.xht.ini           |  4 ----
 .../block-flow-direction-srl-045.xht.ini           |  4 ----
 .../block-flow-direction-srl-046.xht.ini           |  4 ----
 .../block-flow-direction-srl-049.xht.ini           |  4 ----
 .../block-flow-direction-srl-051.xht.ini           |  4 ----
 .../block-flow-direction-srl-052.xht.ini           |  4 ----
 .../block-flow-direction-srl-053.xht.ini           |  4 ----
 .../block-flow-direction-srl-059.xht.ini           |  4 ----
 .../block-flow-direction-srl-061.xht.ini           |  4 ----
 .../block-flow-direction-srl-064.xht.ini           |  4 ----
 .../block-flow-direction-vlr-003.xht.ini           |  4 ----
 .../block-flow-direction-vlr-007.xht.ini           |  4 ----
 .../block-flow-direction-vlr-008.xht.ini           |  4 ----
 .../block-flow-direction-vlr-010.xht.ini           |  4 ----
 .../block-flow-direction-vlr-014.xht.ini           |  4 ----
 .../block-flow-direction-vlr-015.xht.ini           |  4 ----
 .../block-flow-direction-vlr-016.xht.ini           |  4 ----
 .../block-flow-direction-vlr-020.xht.ini           |  4 ----
 .../block-flow-direction-vlr-022.xht.ini           |  4 ----
 .../block-flow-direction-vlr-023.xht.ini           |  4 ----
 .../block-flow-direction-vrl-002.xht.ini           |  4 ----
 .../block-flow-direction-vrl-005.xht.ini           |  4 ----
 .../block-flow-direction-vrl-006.xht.ini           |  4 ----
 .../block-flow-direction-vrl-009.xht.ini           |  4 ----
 .../block-flow-direction-vrl-011.xht.ini           |  4 ----
 .../block-flow-direction-vrl-012.xht.ini           |  4 ----
 .../block-flow-direction-vrl-013.xht.ini           |  4 ----
 .../block-flow-direction-vrl-019.xht.ini           |  4 ----
 .../block-flow-direction-vrl-021.xht.ini           |  4 ----
 .../block-flow-direction-vrl-024.xht.ini           |  4 ----
 .../central-baseline-alignment-002.xht.ini         |  4 ----
 .../central-baseline-alignment-003.xht.ini         |  4 ----
 .../float-contiguous-vlr-013.xht.ini               |  4 ----
 .../float-contiguous-vrl-012.xht.ini               |  4 ----
 ...eight-width-inline-non-replaced-vlr-003.xht.ini | 14 ++++++++++++++
 ...eight-width-inline-non-replaced-vrl-002.xht.ini | 14 ++++++++++++++
 ...line-block-alignment-orthogonal-vlr-003.xht.ini |  4 ----
 ...line-block-alignment-orthogonal-vlr-005.xht.ini |  4 ----
 ...line-block-alignment-orthogonal-vrl-002.xht.ini |  4 ----
 ...line-block-alignment-orthogonal-vrl-004.xht.ini |  4 ----
 .../line-box-direction-htb-001.xht.ini             |  4 ----
 .../line-box-direction-slr-043.xht.ini             |  4 ----
 .../line-box-direction-slr-047.xht.ini             |  4 ----
 .../line-box-direction-slr-048.xht.ini             |  4 ----
 .../line-box-direction-slr-050.xht.ini             |  4 ----
 .../line-box-direction-slr-053.xht.ini             |  4 ----
 .../line-box-direction-slr-054.xht.ini             |  4 ----
 .../line-box-direction-slr-058.xht.ini             |  4 ----
 .../line-box-direction-slr-060.xht.ini             |  4 ----
 .../line-box-direction-srl-042.xht.ini             |  4 ----
 .../line-box-direction-srl-045.xht.ini             |  4 ----
 .../line-box-direction-srl-046.xht.ini             |  4 ----
 .../line-box-direction-srl-049.xht.ini             |  4 ----
 .../line-box-direction-srl-051.xht.ini             |  4 ----
 .../line-box-direction-srl-052.xht.ini             |  4 ----
 .../line-box-direction-srl-057.xht.ini             |  4 ----
 .../line-box-direction-srl-059.xht.ini             |  4 ----
 .../line-box-direction-vlr-003.xht.ini             |  4 ----
 .../line-box-direction-vlr-007.xht.ini             |  4 ----
 .../line-box-direction-vlr-008.xht.ini             |  4 ----
 .../line-box-direction-vlr-010.xht.ini             |  4 ----
 .../line-box-direction-vlr-013.xht.ini             |  4 ----
 .../line-box-direction-vlr-014.xht.ini             |  4 ----
 .../line-box-direction-vlr-018.xht.ini             |  4 ----
 .../line-box-direction-vlr-020.xht.ini             |  4 ----
 .../line-box-direction-vrl-002.xht.ini             |  4 ----
 .../line-box-direction-vrl-005.xht.ini             |  4 ----
 .../line-box-direction-vrl-006.xht.ini             |  4 ----
 .../line-box-direction-vrl-009.xht.ini             |  4 ----
 .../line-box-direction-vrl-011.xht.ini             |  4 ----
 .../line-box-direction-vrl-012.xht.ini             |  4 ----
 .../line-box-direction-vrl-017.xht.ini             |  4 ----
 .../line-box-direction-vrl-019.xht.ini             |  4 ----
 .../row-progression-slr-023.xht.ini                |  4 ----
 .../row-progression-slr-029.xht.ini                |  4 ----
 .../row-progression-srl-022.xht.ini                |  4 ----
 .../row-progression-srl-028.xht.ini                |  4 ----
 .../row-progression-vlr-003.xht.ini                |  4 ----
 .../row-progression-vlr-005.xht.ini                |  4 ----
 .../row-progression-vlr-007.xht.ini                |  4 ----
 .../row-progression-vlr-009.xht.ini                |  4 ----
 .../row-progression-vrl-002.xht.ini                |  4 ----
 .../row-progression-vrl-004.xht.ini                |  4 ----
 .../row-progression-vrl-006.xht.ini                |  4 ----
 .../row-progression-vrl-008.xht.ini                |  4 ----
 .../table-column-order-002.xht.ini                 |  4 ----
 .../table-column-order-003.xht.ini                 |  4 ----
 .../table-column-order-004.xht.ini                 |  4 ----
 .../table-column-order-005.xht.ini                 |  4 ----
 .../table-column-order-slr-007.xht.ini             |  4 ----
 .../table-column-order-srl-006.xht.ini             |  4 ----
 .../text-baseline-vlr-005.xht.ini                  |  4 ----
 .../text-baseline-vrl-004.xht.ini                  |  4 ----
 .../text-combine-upright-layout-rules-001.html.ini |  4 ----
 .../css-writing-modes/text-indent-vlr-003.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vlr-005.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vlr-007.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vlr-009.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vlr-015.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vlr-017.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-002.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-004.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-006.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-008.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-014.xht.ini  |  4 ----
 .../css-writing-modes/text-indent-vrl-016.xht.ini  |  4 ----
 .../images3/object-position-svg-002e.html.ini      |  4 +++-
 1323 files changed, 367 insertions(+), 4715 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/outline-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini

diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
deleted file mode 100644
index 2aea7af73763..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
deleted file mode 100644
index e9d714dc6786..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-052.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
deleted file mode 100644
index 538213da1219..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-053.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
deleted file mode 100644
index 405a71419cde..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-054.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
deleted file mode 100644
index 2316df8a6137..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-070.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
deleted file mode 100644
index 9c1318a7cfbf..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-073.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
deleted file mode 100644
index 01ed73b7e8e7..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-074.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
deleted file mode 100644
index c6b80037dd86..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-075.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
deleted file mode 100644
index 407bc7e548d7..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-090.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
deleted file mode 100644
index 218df150e795..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-093.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
deleted file mode 100644
index 63a60e5670f3..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-094.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
deleted file mode 100644
index 1d140577f7f9..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-095.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
deleted file mode 100644
index c14f9a84b669..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-110.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
deleted file mode 100644
index e77d20f3e462..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-113.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
deleted file mode 100644
index fbd3d3b362d7..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-114.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
deleted file mode 100644
index 370b59f4c7a0..000000000000
--- a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[background-color-115.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
deleted file mode 100644
index 95cf59919bfc..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
deleted file mode 100644
index c10618260856..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
deleted file mode 100644
index 82eb271d4206..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
deleted file mode 100644
index 7ccca5537b4f..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
deleted file mode 100644
index 160ad88e5574..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
deleted file mode 100644
index 913ed94f61f3..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
deleted file mode 100644
index 986e3240df84..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
deleted file mode 100644
index c159e7040a4c..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
deleted file mode 100644
index b83f13aebb4c..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
deleted file mode 100644
index 69a1c1b63e0a..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
deleted file mode 100644
index 68dac964fdab..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
deleted file mode 100644
index 773f75f7ba74..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-021.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
deleted file mode 100644
index f0ca5ad11f2a..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-022.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
deleted file mode 100644
index daf9f2408b58..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-023.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
deleted file mode 100644
index 5fc6d7f4e5e0..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-024.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
deleted file mode 100644
index e996ea78bc2b..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-025.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
deleted file mode 100644
index e674c5a25d1c..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-026.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
deleted file mode 100644
index cc3b13fcb27f..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-027.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
deleted file mode 100644
index f427a9dbefe2..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-028.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
deleted file mode 100644
index c48042c2cb5b..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-029.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
deleted file mode 100644
index bf6ec4489582..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-030.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
deleted file mode 100644
index be6938044014..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-031.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
deleted file mode 100644
index b2c08c247410..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-032.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
deleted file mode 100644
index 4fc26b07f487..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-033.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
deleted file mode 100644
index f6e41cc72929..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-034.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
deleted file mode 100644
index 116ed583c4e9..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-035.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
deleted file mode 100644
index bdd82a14e9fe..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-036.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
deleted file mode 100644
index 70cb1d79980d..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-037.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
deleted file mode 100644
index 686c4668f6b8..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-038.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
deleted file mode 100644
index 9e3b9f65b581..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-039.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
deleted file mode 100644
index 30420944b323..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-040.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
deleted file mode 100644
index 247bfc0cd4ee..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-041.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
deleted file mode 100644
index c6dc8c497951..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-042.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
deleted file mode 100644
index 56f63d8c8d8d..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
deleted file mode 100644
index 37e9674c827e..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-044.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
deleted file mode 100644
index e4465a365ee7..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bidi-box-model-045.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
deleted file mode 100644
index 65503e092586..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
deleted file mode 100644
index 50c9a81d252d..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
deleted file mode 100644
index d4264cde87b2..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
deleted file mode 100644
index 25b783767078..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
deleted file mode 100644
index 1159f6ae42ec..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
deleted file mode 100644
index fa188700353b..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
deleted file mode 100644
index a0e8c0449bd7..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
deleted file mode 100644
index c8de0062515d..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
deleted file mode 100644
index 393a65f5a3a4..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
deleted file mode 100644
index 00df8349decc..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
deleted file mode 100644
index 8c06138fa8f5..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
deleted file mode 100644
index e0ede6e39846..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[direction-applies-to-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
deleted file mode 100644
index ab534971ba52..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-bidi-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
deleted file mode 100644
index 4e64a816b073..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-bidi-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
deleted file mode 100644
index b49585b95914..000000000000
--- a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-bidi-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
deleted file mode 100644
index 491e774b686f..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
deleted file mode 100644
index 30b6d95ada5d..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
deleted file mode 100644
index 621a0a7be756..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-bottom-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
deleted file mode 100644
index 82065b5e559c..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-bottom-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
deleted file mode 100644
index d3833fba4302..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-bottom-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
deleted file mode 100644
index d67aaaa1a164..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-left-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
deleted file mode 100644
index 70e17e746fda..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-left-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
deleted file mode 100644
index e32593e8b6cb..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-left-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
deleted file mode 100644
index 8d261622d2bd..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-right-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
deleted file mode 100644
index ff133579249b..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-right-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
deleted file mode 100644
index 676aea56c3e7..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-right-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
deleted file mode 100644
index a9232d76d9a1..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-top-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
deleted file mode 100644
index 3c6c3998c9ff..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-top-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
deleted file mode 100644
index 7e66134620a4..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-top-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
deleted file mode 100644
index fe746247bfee..000000000000
--- a/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-width-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
deleted file mode 100644
index 51fab0f75fea..000000000000
--- a/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[anonymous-boxes-inheritance-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
deleted file mode 100644
index 2867ce578e12..000000000000
--- a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-in-inline-relpos-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
deleted file mode 100644
index ab612bc846c9..000000000000
--- a/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[display-change-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
deleted file mode 100644
index 79250f38fd48..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
deleted file mode 100644
index 3837a96cef40..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
deleted file mode 100644
index 67b00f22d29b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
deleted file mode 100644
index 5ac7aaad39ae..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
deleted file mode 100644
index 32c19d538409..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
deleted file mode 100644
index 102e2e65e03b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-006.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
deleted file mode 100644
index b7cd4ed6fb9d..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-007.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
deleted file mode 100644
index fd5982bfd0f2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-008.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
deleted file mode 100644
index 5ea40e3051c3..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-009.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
deleted file mode 100644
index f0d7ff205bd0..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-010.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
deleted file mode 100644
index 5bccc43b1895..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-011.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
deleted file mode 100644
index 1c5443a73d43..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-012.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
deleted file mode 100644
index 55c1e5d27eac..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-013.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
deleted file mode 100644
index a9f07e204c13..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-014.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
deleted file mode 100644
index abb2535b7c75..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-015.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
deleted file mode 100644
index 32881148b294..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-016.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
deleted file mode 100644
index d2b39f415e54..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-017.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
deleted file mode 100644
index ffc35397e4f2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-018.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
deleted file mode 100644
index bb24ee56bd50..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-019.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
deleted file mode 100644
index fa3d25ac23f9..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-020.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
deleted file mode 100644
index 1e120d0be0f5..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-021.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
deleted file mode 100644
index 7315e5edc31f..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-022.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
deleted file mode 100644
index e466c5f187c6..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-023.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
deleted file mode 100644
index dc6645ac0ae8..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-024.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
deleted file mode 100644
index bc3eaff8233e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-025.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
deleted file mode 100644
index 68a3750c18bc..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-026.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
deleted file mode 100644
index 3204f8ff9167..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-027.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
deleted file mode 100644
index bbf99baa7f42..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-028.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
deleted file mode 100644
index 3c7fb5609cc3..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-029.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
deleted file mode 100644
index 245a045002d1..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-031.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
deleted file mode 100644
index 45481250bd41..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-032.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
deleted file mode 100644
index cb4fb140646e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-033.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
deleted file mode 100644
index 18f021d2831b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-034.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
deleted file mode 100644
index 149605023a88..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-035.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
deleted file mode 100644
index ba97180d82c7..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-036.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
deleted file mode 100644
index 76e7b3f2f8a6..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-037.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
deleted file mode 100644
index d066139eb149..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-038.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
deleted file mode 100644
index c0c1a556b31f..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-039.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
deleted file mode 100644
index 96c1e927f204..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-040.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
deleted file mode 100644
index c6d938de42a4..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-041.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
deleted file mode 100644
index dbe988c7e151..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-042.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
deleted file mode 100644
index cfbad3e9f9f4..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-043.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
deleted file mode 100644
index 52cb17e16314..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-044.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
deleted file mode 100644
index 99acf7ea9a62..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-045.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
deleted file mode 100644
index ed30de153289..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-046.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
deleted file mode 100644
index 1eb31700f836..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-047.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
deleted file mode 100644
index 76581079fbe1..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-048.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
deleted file mode 100644
index 3ccbe79d387a..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-049.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
deleted file mode 100644
index 3fbb2c57b525..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-050.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
deleted file mode 100644
index 31a08b745383..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-051.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
deleted file mode 100644
index 81c53bdec139..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-052.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
deleted file mode 100644
index e5e6cc8446b8..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-053.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
deleted file mode 100644
index f9e0e37fc614..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-054.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
deleted file mode 100644
index ff1b8b8d05ed..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-055.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
deleted file mode 100644
index f1bb3d2ffdc4..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-056.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
deleted file mode 100644
index ba8673de97c0..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-057.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
deleted file mode 100644
index 59551924708c..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-058.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
deleted file mode 100644
index e4db198735c9..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-059.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
deleted file mode 100644
index 5a4ce0ff3376..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-060.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
deleted file mode 100644
index 6621a90a73ad..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-061.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
deleted file mode 100644
index d10c5075e20a..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-062.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
deleted file mode 100644
index 0c9377c1ed7e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-063.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
deleted file mode 100644
index 8e866cba34f3..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-064.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
deleted file mode 100644
index f3dc663bbb92..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-065.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
deleted file mode 100644
index 4d36c923dd56..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-066.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
deleted file mode 100644
index 25b1bfbf0b3c..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-067.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
deleted file mode 100644
index d28d8714c844..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-068.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
deleted file mode 100644
index 90639913c7a9..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-069.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
deleted file mode 100644
index 94f5ceb5da03..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-070.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
deleted file mode 100644
index 07af904807e5..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-071.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
deleted file mode 100644
index 709e7ed488b8..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-072.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
deleted file mode 100644
index 452fb53c329c..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-073.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
deleted file mode 100644
index 7f95cc74f4a5..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-074.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
deleted file mode 100644
index e24dd9f5635e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-075.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
deleted file mode 100644
index 7a2a4c179556..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-076.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
deleted file mode 100644
index 63f4f4e8b468..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-077.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
deleted file mode 100644
index 38e1f6919d44..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-078.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
deleted file mode 100644
index 89957ca021b6..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-079.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
deleted file mode 100644
index 2c01adb567ed..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-080.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
deleted file mode 100644
index dba222a7fe72..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-081.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
deleted file mode 100644
index 9f41424478a7..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-082.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
deleted file mode 100644
index 30e4390b0e33..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-083.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
deleted file mode 100644
index fb6395342154..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-084.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
deleted file mode 100644
index 2a3073e8aca0..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-085.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
deleted file mode 100644
index 2d2a22147322..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-086.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
deleted file mode 100644
index 8ea36f64af07..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-087.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
deleted file mode 100644
index 7d9b22351a37..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-088.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
deleted file mode 100644
index 2b5ac7c58f0c..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-089.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
deleted file mode 100644
index b557681720b2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-090.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
deleted file mode 100644
index 12d9ebf1a75b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-091.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
deleted file mode 100644
index 9608c5b6c3b7..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-092.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
deleted file mode 100644
index 1de991eee393..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-093.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
deleted file mode 100644
index 6ec56c46ae62..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-094.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
deleted file mode 100644
index e38277ace47b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-095.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
deleted file mode 100644
index f0cd90d81b8e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-096.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
deleted file mode 100644
index cf8291d94aea..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-097.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
deleted file mode 100644
index 47f2528a2ac9..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-098.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
deleted file mode 100644
index b05187e69577..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-099.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
deleted file mode 100644
index 7257af87dc30..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-100.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
deleted file mode 100644
index b7b1943f1e27..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-101.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
deleted file mode 100644
index cee639b065d8..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-102.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
deleted file mode 100644
index 7799f6601fad..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-103.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
deleted file mode 100644
index 050d7ce485c7..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-104.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
deleted file mode 100644
index 2361cf07f895..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-105.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
deleted file mode 100644
index 47a26dca3307..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-106.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
deleted file mode 100644
index 42e68f5425c3..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-107.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
deleted file mode 100644
index 817796d06b40..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-108.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
deleted file mode 100644
index b370d28284b2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-109.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
deleted file mode 100644
index 7cb7d1ace39d..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-110.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
deleted file mode 100644
index 4979eb2a4c00..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-111.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
deleted file mode 100644
index f5db4331e890..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-112.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
deleted file mode 100644
index 48952751d2e8..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-113.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
deleted file mode 100644
index e0d876d87cf2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-114.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
deleted file mode 100644
index 9f677a5ac886..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-115.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
deleted file mode 100644
index 41ff008a55ae..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-116.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
deleted file mode 100644
index f79c590b51b0..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-117.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
deleted file mode 100644
index 09d468fc9bed..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-118.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
deleted file mode 100644
index 853a2aa74366..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-119.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
deleted file mode 100644
index dc3fcd070049..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-120.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
deleted file mode 100644
index 8c49a335430e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-121.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
deleted file mode 100644
index 1eef5c051076..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-122.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
deleted file mode 100644
index 04ad02418568..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-123.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
deleted file mode 100644
index eed9b40c139d..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-124.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
deleted file mode 100644
index 1e686234ed98..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-125.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
deleted file mode 100644
index b6546e202b4d..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-126.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
deleted file mode 100644
index 762492a9eb9a..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-127.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
deleted file mode 100644
index 7ebea69f1adc..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-128.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
deleted file mode 100644
index 0c2f9e30e285..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-129.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
deleted file mode 100644
index dd862bc09df0..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-130.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
deleted file mode 100644
index c37e7216c9b1..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-131.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
deleted file mode 100644
index ab4a77213aa4..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-132.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
deleted file mode 100644
index 40bf25c0a3e1..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-133.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
deleted file mode 100644
index 52aadd53f2ea..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-134.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
deleted file mode 100644
index 1f328e8cd660..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-135.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
deleted file mode 100644
index b1f3d4095550..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-136.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
deleted file mode 100644
index c1bb7cdf1a63..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-137.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
deleted file mode 100644
index 7ff9a1ee91ca..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-138.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
deleted file mode 100644
index 73a4a083c9d2..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-139.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
deleted file mode 100644
index 1f5efbb5db0b..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-140.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
deleted file mode 100644
index 7c2fb7f22553..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-141.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
deleted file mode 100644
index 46b55016db98..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-142.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
deleted file mode 100644
index e0d16e24f27d..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-143.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
deleted file mode 100644
index fb4f24e1845a..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-144.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
deleted file mode 100644
index fe23d4a61c5c..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-145.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
deleted file mode 100644
index c99912411f8e..000000000000
--- a/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[color-174.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
deleted file mode 100644
index 6e57de9c6190..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c412-blockw-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
deleted file mode 100644
index 78256de92fde..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c412-hz-box-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
deleted file mode 100644
index e0bd236d3282..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c42-ibx-ht-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
deleted file mode 100644
index 99ca1352d049..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c43-rpl-bbx-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
deleted file mode 100644
index 071750b82989..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c44-ln-box-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
deleted file mode 100644
index 0db5341695a0..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c44-ln-box-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
deleted file mode 100644
index 0458e23a0d74..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c44-ln-box-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
deleted file mode 100644
index 3c5e280ee564..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c44-ln-box-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
deleted file mode 100644
index d3cdd847f8f2..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c526-font-sz-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
deleted file mode 100644
index 87381f51bda4..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c526-font-sz-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
deleted file mode 100644
index d2be0d44e265..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c526-font-sz-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
deleted file mode 100644
index 9ceb04910a43..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgre-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
deleted file mode 100644
index 4ae8f06cfeec..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgre-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
deleted file mode 100644
index fb912f02074e..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
deleted file mode 100644
index 70132cb888eb..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
deleted file mode 100644
index 7140d13ff581..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
deleted file mode 100644
index c0082139a23a..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
deleted file mode 100644
index dfe520caa0ba..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
deleted file mode 100644
index 06957b4a7859..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c534-bgreps-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
deleted file mode 100644
index 71a86b682dff..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c536-bgpos-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
deleted file mode 100644
index 885eac522da6..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c536-bgpos-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
deleted file mode 100644
index cf650b57cee6..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c541-word-sp-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
deleted file mode 100644
index 61907e7767e1..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c542-letter-sp-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
deleted file mode 100644
index 651a3dba5d56..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c542-letter-sp-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
deleted file mode 100644
index a0ab00a2f152..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c544-valgn-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
deleted file mode 100644
index 126f0b5d0fa4..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c547-indent-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
deleted file mode 100644
index 341a61d5e8e4..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-leadin-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
deleted file mode 100644
index c1740d60947f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
deleted file mode 100644
index 6e68a35123d2..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
deleted file mode 100644
index 80fd3fc9279f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
deleted file mode 100644
index 44a29c17fdbc..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
deleted file mode 100644
index 810f45b08173..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c548-ln-ht-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
deleted file mode 100644
index 422fe19c0c3f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5501-imrgn-t-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
deleted file mode 100644
index facef1e0595e..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5501-mrgn-t-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
deleted file mode 100644
index 23a5e02c88cc..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5502-imrgn-r-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
deleted file mode 100644
index bb5c3e0cf4bc..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5502-imrgn-r-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
deleted file mode 100644
index 1eff2eea74a6..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5502-imrgn-r-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
deleted file mode 100644
index f20dcaea35fd..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5502-mrgn-r-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
deleted file mode 100644
index 73eefd85257f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5502-mrgn-r-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
deleted file mode 100644
index 73a66f149cd9..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5503-imrgn-b-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
deleted file mode 100644
index 81d6575e48ea..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5503-mrgn-b-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
deleted file mode 100644
index 7ce09fc35d29..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-imrgn-l-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
deleted file mode 100644
index 54480189ff4f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-imrgn-l-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
deleted file mode 100644
index ea66767e6a44..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-imrgn-l-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
deleted file mode 100644
index 43222ad9acc0..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-imrgn-l-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
deleted file mode 100644
index 6304d10d189c..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-mrgn-l-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
deleted file mode 100644
index 0f1e16d2d834..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5504-mrgn-l-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
deleted file mode 100644
index 83fcee90c321..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5505-mrgn-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
deleted file mode 100644
index d126d15393b3..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5505-mrgn-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
deleted file mode 100644
index bd245bd34dc6..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5505-mrgn-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
deleted file mode 100644
index e358cbbb540a..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5506-ipadn-t-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
deleted file mode 100644
index 851f35544680..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5506-ipadn-t-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
deleted file mode 100644
index c19e56fe21a1..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5506-ipadn-t-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
deleted file mode 100644
index b0ef335e5c20..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5506-padn-t-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
deleted file mode 100644
index 46aaa646740c..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5507-ipadn-r-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
deleted file mode 100644
index 85bf88d79402..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5507-ipadn-r-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
deleted file mode 100644
index ba2146a3871a..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5507-ipadn-r-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
deleted file mode 100644
index 1d04c5189f0a..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5507-padn-r-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
deleted file mode 100644
index ea1af1d9c1ad..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5507-padn-r-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
deleted file mode 100644
index 840b0b1b0399..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5508-ipadn-b-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
deleted file mode 100644
index 9dc8de8d0ba9..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5508-ipadn-b-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
deleted file mode 100644
index 1edc63ed4911..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5508-ipadn-b-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
deleted file mode 100644
index 01eb147e1467..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5508-ipadn-b-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
deleted file mode 100644
index 51aff4c23147..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5509-ipadn-l-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
deleted file mode 100644
index ded2afd020c7..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5509-ipadn-l-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
deleted file mode 100644
index e2c4f5b68772..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5509-ipadn-l-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
deleted file mode 100644
index d554135f64ec..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5509-padn-l-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
deleted file mode 100644
index a16cc79f5015..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5509-padn-l-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
deleted file mode 100644
index 22b6f17e4bae..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5510-padn-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
deleted file mode 100644
index 955075dfebf9..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltblck-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
deleted file mode 100644
index 0e3e22552132..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltinln-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
deleted file mode 100644
index 168d233da07e..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5525-fltmrgn-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
deleted file mode 100644
index 4f2b21adccd6..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c5526-fltclr-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
deleted file mode 100644
index af0580733dbd..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c562-white-sp-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
deleted file mode 100644
index 823a9627b664..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c61-ex-len-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
deleted file mode 100644
index 4d644e245031..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c61-rel-len-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
deleted file mode 100644
index 5f1f5e869d4f..000000000000
--- a/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[c62-percent-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
deleted file mode 100644
index 7b67e93d74e4..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[clear-clearance-calculation-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
deleted file mode 100644
index 300bae920aa8..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
deleted file mode 100644
index 03b34e7ff4a0..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-007.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
deleted file mode 100644
index d5aff3d4f11e..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-008.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
deleted file mode 100644
index 8f42a42df690..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-009.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
deleted file mode 100644
index c5658b867195..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-010.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
deleted file mode 100644
index 76d2010dd699..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-011.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
deleted file mode 100644
index 562fe103f870..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[float-non-replaced-width-012.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
deleted file mode 100644
index f9e7506182e0..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-006.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
deleted file mode 100644
index 4be8cc0ff042..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-009.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
deleted file mode 100644
index ae4092811b8f..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-111.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
deleted file mode 100644
index e5a4632eea4b..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-112.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
deleted file mode 100644
index 71b607cee83c..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-113.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
deleted file mode 100644
index ebdd99ea2559..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-115.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
deleted file mode 100644
index e782caf42799..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-116.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
deleted file mode 100644
index 12cbe35b80e4..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-117.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
deleted file mode 100644
index a22aa6ed6951..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-118.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
deleted file mode 100644
index ccfe19f3779c..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-119.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
deleted file mode 100644
index cd5239dd6406..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-120.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
deleted file mode 100644
index b6ecf7bae571..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-121.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
deleted file mode 100644
index 515575fb3bfc..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-122.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
deleted file mode 100644
index 2db744484a01..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-123.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
deleted file mode 100644
index 464fcbbbaa27..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-132.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
deleted file mode 100644
index f448ac4f0106..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-133.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
deleted file mode 100644
index 4a7efa10a390..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-134.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
deleted file mode 100644
index 378ca492c791..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-136.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
deleted file mode 100644
index e117959fa5f2..000000000000
--- a/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[floats-145.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
index c96a5c66fcae..b0f366f76e2b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
@@ -1,4 +1,13 @@
 [font-011.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
index 932aa628cbd8..05808c5c39da 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
@@ -1,4 +1,13 @@
 [font-012.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
index b97baf2408a6..a9314b0f3307 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
@@ -1,4 +1,13 @@
 [font-013.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
index dbf7cdb97630..e1e91a5b0218 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
@@ -1,4 +1,13 @@
 [font-014.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
index d3a1199b5515..ecf469e3bd11 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
@@ -1,4 +1,13 @@
 [font-015.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
index 50afda26881b..614e24466977 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
@@ -1,4 +1,13 @@
 [font-016.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
index 9ae75c0c604d..13489358eaab 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
@@ -1,4 +1,13 @@
 [font-029.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
index d68f5303b211..fd5b861700e1 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
@@ -1,4 +1,13 @@
 [font-030.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
index 7c30bd718fae..5632e4da2313 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
@@ -1,4 +1,13 @@
 [font-031.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
index 942960afea4f..168da05bd4e6 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
@@ -1,4 +1,13 @@
 [font-032.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
index c18cd4881d08..ec6dbbb6a57c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
@@ -1,4 +1,13 @@
 [font-042.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
index 3f912a30b3f5..5c2f6121d876 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
@@ -1,4 +1,13 @@
 [font-043.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
deleted file mode 100644
index 85e6f4d642ae..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-051.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
deleted file mode 100644
index d358803ad129..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-family-009.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
index e9d9a02e1cc1..bda6d93c360e 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-001.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
index 8141f65d121b..3e62f6da2563 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-002.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
index b8ae768958be..a05d9757bae7 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-005.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
index ccb408b9cf48..3d26a145ffc6 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-006.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
index d9de340b3929..664f831ac9db 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-007.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
index 19fe16eda4de..c973de58977c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-008.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
index 07ecbccba7c2..2d32b9ac6552 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-009.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
index d9b07e63a90c..c1a2322605ae 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-010.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
index ddb74c1df1e5..ba2223949ecb 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-011.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
index 51e6cb56bc95..980126bcb524 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-014.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
index 2ffde52eb6e9..c82a2bd910e3 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-015.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
index 1fa5760da257..47a5ec6b6572 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
@@ -1,4 +1,13 @@
 [font-family-applies-to-017.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
deleted file mode 100644
index 4838ed24bc12..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-size-120.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
index 8810990b00ba..d37cfb2e72d6 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
@@ -1,4 +1,13 @@
 [font-size-122.xht]
   expected:
-    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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
deleted file mode 100644
index 8c017d7359c7..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[font-size-124.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
deleted file mode 100644
index c6b1bc063e88..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[fonts-010.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
deleted file mode 100644
index 1effa7d61624..000000000000
--- a/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[fonts-011.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
deleted file mode 100644
index 12cc3ad60656..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-padding-bleed-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
deleted file mode 100644
index 9a683214b55e..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-padding-bleed-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
deleted file mode 100644
index 3d3bb37c91fc..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[border-padding-bleed-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
deleted file mode 100644
index 229e456ea418..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-formatting-context-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
deleted file mode 100644
index cde923583fce..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-formatting-context-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
deleted file mode 100644
index a50cf5001ab3..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-formatting-context-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
deleted file mode 100644
index 52b624e810ce..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-formatting-context-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
deleted file mode 100644
index c369bee9a41b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-formatting-context-022.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
deleted file mode 100644
index a147f0164559..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[leading-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
deleted file mode 100644
index 50c0379b4cae..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
deleted file mode 100644
index 4831608f72a2..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
deleted file mode 100644
index c7371e2cdad2..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
deleted file mode 100644
index 2fb2bed4c769..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
deleted file mode 100644
index 871a2d99cf0c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
deleted file mode 100644
index f6d1fd5b5f46..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
deleted file mode 100644
index 6b8de39ee627..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
deleted file mode 100644
index 3f24b1253ce9..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
deleted file mode 100644
index f7e16302d8a8..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
deleted file mode 100644
index febc13f1f771..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
deleted file mode 100644
index 3907494b6fe0..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-024.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
deleted file mode 100644
index bd56b165f477..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-025.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
deleted file mode 100644
index 75bbe3dbfa9c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-026.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
deleted file mode 100644
index 1730fdb3dc44..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-027.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
deleted file mode 100644
index 13acc52dfbaa..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-028.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
deleted file mode 100644
index b64503252994..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-029.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
deleted file mode 100644
index 7be6184ea142..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-035.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
deleted file mode 100644
index f1a38e0829bd..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-037.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
deleted file mode 100644
index 283cc39e3034..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-038.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
deleted file mode 100644
index 4e0df393c48d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-039.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
deleted file mode 100644
index dac7f0d83144..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-040.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
deleted file mode 100644
index 283080d2c82f..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-046.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
deleted file mode 100644
index 9f435bdce2e0..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-048.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
deleted file mode 100644
index ce3379879437..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
deleted file mode 100644
index ae47e25213db..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-050.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
deleted file mode 100644
index e89bd4a4ebdc..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-051.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
deleted file mode 100644
index 3ac28768bacf..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-057.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
deleted file mode 100644
index 5413e63983a1..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-058.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
deleted file mode 100644
index 2aa328b5f08d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-059.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
deleted file mode 100644
index 9fe04bd11279..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-060.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
deleted file mode 100644
index 3d2c06cf863f..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-061.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
deleted file mode 100644
index f82bbfc53911..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-062.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
deleted file mode 100644
index cb4e4ce53a18..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-068.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
deleted file mode 100644
index 0ea1e482fa43..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-069.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
deleted file mode 100644
index 849e34834575..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-070.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
deleted file mode 100644
index e63ebdc63546..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-071.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
deleted file mode 100644
index f14aff60a6aa..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-072.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
deleted file mode 100644
index 5b97c038f39c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-073.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
deleted file mode 100644
index 5351e913d6aa..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-079.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
deleted file mode 100644
index 9b7603212e9b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
deleted file mode 100644
index c2272b798131..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-081.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
deleted file mode 100644
index 947c0463290e..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-082.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
deleted file mode 100644
index 7d33bda351e5..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
deleted file mode 100644
index 1a1b8512202d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
deleted file mode 100644
index 0e2862ab92f2..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-090.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
deleted file mode 100644
index 50bcd0b61515..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
deleted file mode 100644
index 7924026e4897..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-093.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
deleted file mode 100644
index 87623e054d4d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-094.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
deleted file mode 100644
index ddb457f7b68a..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-095.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
deleted file mode 100644
index edaf40f0bdb2..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-101.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
deleted file mode 100644
index e49e019f17a8..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-102.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
deleted file mode 100644
index ef5da82d3e77..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-103.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
deleted file mode 100644
index 9c0501d19027..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-104.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
deleted file mode 100644
index 216655ccfa4c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-105.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
deleted file mode 100644
index ecb4821944e0..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-106.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
deleted file mode 100644
index 3a8a95b84783..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-112.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
deleted file mode 100644
index 37e9e20f7eb3..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-121.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
deleted file mode 100644
index 17bc0349699c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-127.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
deleted file mode 100644
index 7f00b48a5d37..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-128.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
deleted file mode 100644
index 02d875828623..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-height-bleed-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
deleted file mode 100644
index cf17447f08d1..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
deleted file mode 100644
index 21d7794dcf45..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
deleted file mode 100644
index eb7e8d59c504..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
deleted file mode 100644
index c998200fa834..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
deleted file mode 100644
index b4eabec7cc0c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
deleted file mode 100644
index 381f677412dc..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
deleted file mode 100644
index 067c5dd64b1f..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
deleted file mode 100644
index 8fcaa1e79419..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
deleted file mode 100644
index 155bb1fe5071..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
deleted file mode 100644
index 4915636edb9d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
deleted file mode 100644
index 420988283570..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-028.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
deleted file mode 100644
index 529cc1f73b44..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-029.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
deleted file mode 100644
index f3171f3ec079..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-030.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
deleted file mode 100644
index 4fb9471fd909..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-031.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
deleted file mode 100644
index e8a1e6caf5a6..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-032.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
deleted file mode 100644
index 330531c12cc0..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-040.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
deleted file mode 100644
index 85cb29202236..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-041.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
deleted file mode 100644
index 3fbdd355288d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-042.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
deleted file mode 100644
index 7c3f75407c4c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
deleted file mode 100644
index 20b0341a0c9d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-044.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
deleted file mode 100644
index 7ec5bd0173fe..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-052.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
deleted file mode 100644
index f4589cfdfdbe..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-053.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
deleted file mode 100644
index faa8a24f2baa..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-054.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
deleted file mode 100644
index 694faa82912a..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-055.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
deleted file mode 100644
index 110126661a72..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-056.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
deleted file mode 100644
index b4446e5076c6..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-064.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
deleted file mode 100644
index 0c5a96483cb3..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-065.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
deleted file mode 100644
index 06aa8b6879a9..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-066.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
deleted file mode 100644
index ba0a05a1256b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-067.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
deleted file mode 100644
index eba17d474854..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-068.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
deleted file mode 100644
index 666fcce40e65..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-076.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
deleted file mode 100644
index 7d31c1f82dfb..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-077.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
deleted file mode 100644
index cbf1b9535c0b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-078.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
deleted file mode 100644
index bd5db7721302..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-079.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
deleted file mode 100644
index dee7a30e5870..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
deleted file mode 100644
index f5513619d988..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-088.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
deleted file mode 100644
index f177103608f9..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-089.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
deleted file mode 100644
index 8fd1bbd7815c..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-090.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
deleted file mode 100644
index 2dca8fde1cb4..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
deleted file mode 100644
index 2d88a4ff080e..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
deleted file mode 100644
index c6f3089a3890..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-100.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
deleted file mode 100644
index 303ce09ff212..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-101.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
deleted file mode 100644
index 83e26bbde7dc..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-102.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
deleted file mode 100644
index 3a7739490f38..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-103.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
deleted file mode 100644
index 00d30a7a36d3..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-104.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
deleted file mode 100644
index 44a5dd6a9463..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-109.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
deleted file mode 100644
index e752dead0453..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-110.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
deleted file mode 100644
index 8a76667d99d1..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-111.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
deleted file mode 100644
index 176af1555b50..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-117a.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
deleted file mode 100644
index c380edd8fc79..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-118a.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
deleted file mode 100644
index e2edf139bf7b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-121.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
deleted file mode 100644
index 86d73b7c2fc6..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
deleted file mode 100644
index 357e9fad0a6b..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
deleted file mode 100644
index 0f2a30b5cb1f..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
deleted file mode 100644
index b16b7c4981a1..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
deleted file mode 100644
index 32f52fef5971..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
deleted file mode 100644
index e26c76b3ca8f..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
deleted file mode 100644
index c27b781aa940..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
deleted file mode 100644
index 98482a6c8b1e..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
deleted file mode 100644
index 452559740627..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
deleted file mode 100644
index f06706177ca3..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
deleted file mode 100644
index 3ae80b593b97..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
deleted file mode 100644
index 87be0e773c67..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
deleted file mode 100644
index 2a89d73af9fb..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-applies-to-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
deleted file mode 100644
index 55a1143f755d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-baseline-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
deleted file mode 100644
index 093b9ada572d..000000000000
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vertical-align-baseline-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
index 339c64bb1c1a..f7818d3a154a 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
@@ -1,7 +1,9 @@
 [vertical-align-baseline-004a.xht]
   expected:
-    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.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
index 51c8f80ed304..3de3f64bee33 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
@@ -1,7 +1,9 @@
 [vertical-align-baseline-005a.xht]
   expected:
-    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.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
-    FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
deleted file mode 100644
index 5f1b283b007e..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-border-padding-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
deleted file mode 100644
index 1ff5c8d349e0..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
deleted file mode 100644
index 8f3b4dbb64ba..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
deleted file mode 100644
index 2c6d4e268567..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-bottom-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
deleted file mode 100644
index 13fcad29312f..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-106.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
deleted file mode 100644
index 2f41bc5a8f76..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-130.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
deleted file mode 100644
index 74119be9729f..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-131.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
deleted file mode 100644
index 139c627c4130..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-137.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
deleted file mode 100644
index f0b49de7b201..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-138.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
deleted file mode 100644
index 21487cfe161d..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-collapse-155.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
deleted file mode 100644
index f9babbcdfcbb..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-inline-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
deleted file mode 100644
index 008ac66de542..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-left-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
deleted file mode 100644
index 21f25e649fb9..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-left-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
deleted file mode 100644
index c02c4a69c06e..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-right-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
deleted file mode 100644
index 20c3b1fb1348..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-right-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
deleted file mode 100644
index 8cb9fb8dbccb..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-top-091.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
deleted file mode 100644
index 6672cb7b074c..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-top-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
deleted file mode 100644
index 8df2ee37c6c7..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[margin-top-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
deleted file mode 100644
index 0e2b0dc81744..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-bottom-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
deleted file mode 100644
index af7c7069a56f..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-bottom-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
deleted file mode 100644
index d9d6ebf10113..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-bottom-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
deleted file mode 100644
index c4258f52f65a..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-left-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
deleted file mode 100644
index 091577635414..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-left-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
deleted file mode 100644
index b141c08c7cdc..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-left-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
deleted file mode 100644
index 31896f35a895..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
deleted file mode 100644
index 465ca0c1be36..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
deleted file mode 100644
index 06831df669ac..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-right-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
deleted file mode 100644
index 320f75dbbaab..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-top-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
deleted file mode 100644
index 9792b40e1084..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-top-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
deleted file mode 100644
index 74d79ccf2327..000000000000
--- a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[padding-top-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
deleted file mode 100644
index 69883edbfd40..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-formatting-contexts-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
deleted file mode 100644
index 1333a0eac636..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-non-replaced-height-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
deleted file mode 100644
index 9349981ceac8..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-non-replaced-width-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
deleted file mode 100644
index a052b529cdd2..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[block-replaced-width-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
deleted file mode 100644
index aba961f32b52..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[blocks-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
deleted file mode 100644
index 8860e73b247d..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
deleted file mode 100644
index 7f2c48aabc51..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
deleted file mode 100644
index d170672f10fe..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[height-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
deleted file mode 100644
index 000c45662f06..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-non-replaced-width-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
deleted file mode 100644
index e0a060afb106..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-non-replaced-width-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
deleted file mode 100644
index 46cce6a19d74..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-non-replaced-width-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
deleted file mode 100644
index 59de3d979e59..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-block-non-replaced-width-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
deleted file mode 100644
index fc39407aeb52..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-non-replaced-height-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
deleted file mode 100644
index 0cb917413a83..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-non-replaced-height-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
deleted file mode 100644
index d97668d5bf89..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-non-replaced-width-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
deleted file mode 100644
index 93feaa3128dc..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inline-non-replaced-width-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
deleted file mode 100644
index e2c5531343b5..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inlines-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
deleted file mode 100644
index 094df486738b..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[inlines-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
deleted file mode 100644
index 1852bbf200d5..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
deleted file mode 100644
index b6eadd76cc1e..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
deleted file mode 100644
index ac750433f7ba..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
deleted file mode 100644
index 66cb95409142..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-height-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
deleted file mode 100644
index 6b10d6adb5ca..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
deleted file mode 100644
index 7655faa2d2cd..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
deleted file mode 100644
index 119ddc756c07..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
deleted file mode 100644
index 42dee9f31fcb..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-width-107.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
deleted file mode 100644
index af44ab714cc0..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[max-width-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
deleted file mode 100644
index 15be64ba7155..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-067.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
deleted file mode 100644
index d68ac05b3d5c..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-068.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
deleted file mode 100644
index 0a6b6354b9a3..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-070.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
deleted file mode 100644
index bc4ea096b494..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-071.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
deleted file mode 100644
index 508b2f4a25d1..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-078.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
deleted file mode 100644
index 4d90849513b0..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-079.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
deleted file mode 100644
index 20d3dccfe5a2..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
deleted file mode 100644
index 8e93f9e8bd20..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-081.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
deleted file mode 100644
index 1c4e48f82c16..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-082.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
deleted file mode 100644
index 5c8a8ee90d30..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
deleted file mode 100644
index 070e825cec01..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
deleted file mode 100644
index b84c66279e9a..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-height-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
deleted file mode 100644
index f52b82266013..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
deleted file mode 100644
index 90e9cdba12d4..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
deleted file mode 100644
index f19aa7d74837..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
deleted file mode 100644
index 8d0dc948f859..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[min-width-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
deleted file mode 100644
index 75ecaa41a231..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[width-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
deleted file mode 100644
index d32a40639361..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[width-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
deleted file mode 100644
index a101d2cda066..000000000000
--- a/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[width-084.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
deleted file mode 100644
index d6c276d9e38b..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-height-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
deleted file mode 100644
index 5941be5d93f7..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-height-007.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
deleted file mode 100644
index 91b7d3788c5d..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-height-009.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
deleted file mode 100644
index 404146e066d5..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-max-height-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
deleted file mode 100644
index 976da61cd893..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
deleted file mode 100644
index 66170779cfca..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
deleted file mode 100644
index de23383f426c..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
deleted file mode 100644
index 6a1659960c4b..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
deleted file mode 100644
index ae6d7eebea07..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
deleted file mode 100644
index 27c2e7f85229..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-006.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
deleted file mode 100644
index 13a91cbd93ae..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-007.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
deleted file mode 100644
index 48131908e9c4..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-008.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
deleted file mode 100644
index 694164ae86f8..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-010.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
deleted file mode 100644
index 9bdc1232b40a..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-011.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
deleted file mode 100644
index 2d23f174c993..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-012.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
deleted file mode 100644
index cf94b6c10b6a..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-013.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
deleted file mode 100644
index f2c99f4d5e34..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-014.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
deleted file mode 100644
index cb465ee95232..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-016.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
deleted file mode 100644
index 0128b65e7b85..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-017.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
deleted file mode 100644
index b744fe8516b3..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-018.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
deleted file mode 100644
index fd42369b44d0..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-019.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
deleted file mode 100644
index 472b3c0dd960..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-020.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
deleted file mode 100644
index f0d126d4a76f..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-021.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
deleted file mode 100644
index 84091ae8a3ef..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-022.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
deleted file mode 100644
index d7eed39e28e3..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-023.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
deleted file mode 100644
index cfe781b0d033..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[absolute-non-replaced-width-024.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
deleted file mode 100644
index 8520bdedb5ae..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-091.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
deleted file mode 100644
index b6411e1d3750..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[bottom-092.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
deleted file mode 100644
index 4df1e74d6ec0..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-091.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
deleted file mode 100644
index fe3108bb6942..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[left-092.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
deleted file mode 100644
index 362d8215d76c..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-relative-033.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
deleted file mode 100644
index 4c62dc5aebac..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-091.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
deleted file mode 100644
index 9fd49d027f2f..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[right-092.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
deleted file mode 100644
index 2d5b155115b9..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-091.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
deleted file mode 100644
index 46955fe48609..000000000000
--- a/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[top-092.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
deleted file mode 100644
index 8e981dc00774..000000000000
--- a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[first-line-pseudo-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
deleted file mode 100644
index e9e300ad4ef8..000000000000
--- a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[first-line-pseudo-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
deleted file mode 100644
index e96d3843fef1..000000000000
--- a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[first-line-pseudo-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
deleted file mode 100644
index da4acf85ee2d..000000000000
--- a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[first-line-pseudo-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
deleted file mode 100644
index 2374d59904a2..000000000000
--- a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[first-line-pseudo-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
deleted file mode 100644
index ca7457576d24..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[collapsing-border-model-010a.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
deleted file mode 100644
index 4a070ad359e4..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[collapsing-border-model-010b.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
deleted file mode 100644
index cc0e9ad078a5..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-height-algorithm-008a.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
deleted file mode 100644
index f9bb1efa7e4f..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-height-algorithm-008b.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
deleted file mode 100644
index ac04582dca7b..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-height-algorithm-008c.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
deleted file mode 100644
index bde502399417..000000000000
--- a/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[table-margin-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
deleted file mode 100644
index 60cbe77bd350..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
deleted file mode 100644
index 6406469afd38..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
deleted file mode 100644
index db80eca051b8..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
deleted file mode 100644
index d149e1dfe1b9..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
deleted file mode 100644
index dfe1d9711a52..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
deleted file mode 100644
index 37df6c0cd337..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
deleted file mode 100644
index 91a79556d6d1..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
deleted file mode 100644
index b5d0c1bcdd74..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
deleted file mode 100644
index d666980bdadc..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
deleted file mode 100644
index bcf7db9d3fcb..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[painting-order-underline-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
deleted file mode 100644
index 123b96bd5bf9..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-bidi-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
deleted file mode 100644
index 2d26b5b87d7e..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
deleted file mode 100644
index acbfd861a82e..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
deleted file mode 100644
index 8fd713ff0fba..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
deleted file mode 100644
index 9c48a2fc9a46..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
deleted file mode 100644
index f6794bc5230b..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
deleted file mode 100644
index c91d075aaac1..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
deleted file mode 100644
index b6991d27331d..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
deleted file mode 100644
index b73f17e9e9d3..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-align-white-space-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
deleted file mode 100644
index 0db081dce04e..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
deleted file mode 100644
index 6e2295ece61e..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
deleted file mode 100644
index e39d15c981bd..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
deleted file mode 100644
index a181daffebf2..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
deleted file mode 100644
index 1615a594bda9..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
deleted file mode 100644
index e01c44674e2d..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-031.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
deleted file mode 100644
index 856c50992622..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-032.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
deleted file mode 100644
index e177ee8eb66d..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
deleted file mode 100644
index cdc6c9ebc7f9..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-044.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
deleted file mode 100644
index bfa1928668cb..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-055.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
deleted file mode 100644
index a83273f12829..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-056.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
deleted file mode 100644
index d859170467ea..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-067.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
deleted file mode 100644
index 465585843d04..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-068.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
deleted file mode 100644
index bdac38e99675..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-079.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
deleted file mode 100644
index a448d05f56b7..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
deleted file mode 100644
index 501f29ba5b75..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
deleted file mode 100644
index 7b9b115041dc..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
deleted file mode 100644
index 9e576c37ad7b..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
deleted file mode 100644
index bcdfbe18a4bc..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
deleted file mode 100644
index c9fd9f473ee0..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-bidi-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
deleted file mode 100644
index aced1cc4456e..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-collapsing-bidi-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
deleted file mode 100644
index 0de1e513107a..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-mixed-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
deleted file mode 100644
index 902f50ab5487..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
deleted file mode 100644
index ba5241d90917..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
deleted file mode 100644
index 1a4bdb220d07..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
deleted file mode 100644
index 7925523b0960..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
deleted file mode 100644
index 55bf71621432..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
deleted file mode 100644
index b5d088608f25..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
deleted file mode 100644
index 104f6b7516bb..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
deleted file mode 100644
index 6716a58a2045..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
deleted file mode 100644
index 7077dc942bcd..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-normal-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
deleted file mode 100644
index 0f2b407d8a4d..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-nowrap-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
deleted file mode 100644
index e6007f285c59..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-nowrap-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
deleted file mode 100644
index 22c0ea83d4c0..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-nowrap-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
deleted file mode 100644
index 140e40ee5026..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-pre-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
deleted file mode 100644
index cf79c7599581..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-pre-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
deleted file mode 100644
index 51aac6fa319b..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-pre-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
deleted file mode 100644
index 6ae897994b77..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-pre-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
deleted file mode 100644
index fbe05d0a25f1..000000000000
--- a/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[white-space-processing-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
deleted file mode 100644
index 3a5efb470642..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
deleted file mode 100644
index 17156054d5b2..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
deleted file mode 100644
index 516832efb0ed..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
deleted file mode 100644
index fdf506debbd6..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
deleted file mode 100644
index 1a33e664df2e..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
deleted file mode 100644
index d783ae436934..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
deleted file mode 100644
index 41dd877ac5ab..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
deleted file mode 100644
index 237695b243cb..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
deleted file mode 100644
index 0c06db22def1..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
deleted file mode 100644
index ffed90f150d8..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
deleted file mode 100644
index 9cee9d8bae78..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
deleted file mode 100644
index 911eaadde08c..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
deleted file mode 100644
index 36cdc17040a7..000000000000
--- a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[overflow-applies-to-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
index 5700eb1990e3..70d41f9fa3bd 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
@@ -1,4 +1,13 @@
 [numbers-units-007.xht]
   expected:
-    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
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
index 42a27e277a33..38d063e0e0b3 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
@@ -1,4 +1,13 @@
 [numbers-units-009.xht]
   expected:
-    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
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
index ea27e1f6a071..50d2a09ae522 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
@@ -1,4 +1,13 @@
 [numbers-units-010.xht]
   expected:
-    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
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
deleted file mode 100644
index 6562eb98cf1b..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[numbers-units-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
deleted file mode 100644
index 0eaf6425013e..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[numbers-units-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
deleted file mode 100644
index c8adb2fe5ecf..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[numbers-units-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
deleted file mode 100644
index 68ec7ee56f1e..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[numbers-units-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
deleted file mode 100644
index 63e3b794dc19..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[numbers-units-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
index f0946dfe4930..f4b0d4579fac 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
@@ -1,4 +1,13 @@
 [numbers-units-021.xht]
   expected:
-    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
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
+    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
deleted file mode 100644
index 38c6504447cc..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
deleted file mode 100644
index 53a68f8251ff..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
deleted file mode 100644
index 7bfba9a530ca..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
deleted file mode 100644
index d93292d2e625..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
deleted file mode 100644
index f2bf98b9c037..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
deleted file mode 100644
index f681f9268a5a..000000000000
--- a/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[units-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini b/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
deleted file mode 100644
index 554dd5f9ab74..000000000000
--- a/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[visibility-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini b/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
deleted file mode 100644
index 7d86d413e717..000000000000
--- a/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[anonymous-boxes-001a.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
deleted file mode 100644
index a35761851709..000000000000
--- a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[stack-floats-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
deleted file mode 100644
index 02e56f98c527..000000000000
--- a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[stack-floats-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
deleted file mode 100644
index b9f726a8cec6..000000000000
--- a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[stack-floats-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
deleted file mode 100644
index 3e4f47b5e4e5..000000000000
--- a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[stack-floats-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
deleted file mode 100644
index 7999e77446f7..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
deleted file mode 100644
index 0d580194368b..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
deleted file mode 100644
index d5c877dd7758..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
deleted file mode 100644
index fd12e8af84cf..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-009.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
deleted file mode 100644
index 67c999b7c7ac..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
deleted file mode 100644
index 6fbdb97af500..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
deleted file mode 100644
index 787af28b796e..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-layout-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
index 19b5250abf58..4cf049b8064a 100644
--- a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
@@ -4,3 +4,5 @@
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
deleted file mode 100644
index b407ec30ea53..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-paint-022.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
deleted file mode 100644
index ff64ce7b2dde..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-paint-023.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini b/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
deleted file mode 100644
index 2e8785ab3d36..000000000000
--- a/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[contain-size-breaks-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini b/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
deleted file mode 100644
index c9c4a3cacdca..000000000000
--- a/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[letter-spacing-applies-to-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini b/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
deleted file mode 100644
index 5ed43bb8ed34..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[align-items-004.htm]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini b/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
deleted file mode 100644
index 0080734e3ba3..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[align-items-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
deleted file mode 100644
index 77111e740f3f..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flex-minimum-width-flex-items-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
deleted file mode 100644
index 643966967cb2..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flex-minimum-width-flex-items-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini b/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
deleted file mode 100644
index 1539b02ca965..000000000000
--- a/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[flexbox_flex-natural-mixed-basis-auto.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
deleted file mode 100644
index 02bf202e2658..000000000000
--- a/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[font-size-adjust-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
deleted file mode 100644
index 72406d1f52db..000000000000
--- a/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[font-size-adjust-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
deleted file mode 100644
index 8c7f95e9c82a..000000000000
--- a/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[font-size-adjust-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
deleted file mode 100644
index f6b6b6df0f34..000000000000
--- a/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[font-size-adjust-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
deleted file mode 100644
index ddee9deeba62..000000000000
--- a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[grid-self-baseline-changes-grid-area-size-001.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
deleted file mode 100644
index 8ecd1710d754..000000000000
--- a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[grid-self-baseline-changes-grid-area-size-004.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
deleted file mode 100644
index f5de535a1df6..000000000000
--- a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[grid-self-baseline-changes-grid-area-size-005.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
deleted file mode 100644
index 1ee1f916e573..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-template-columns-fit-content-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
deleted file mode 100644
index 6dbbe0803085..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-template-rows-fit-content-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
deleted file mode 100644
index d2b5926f95d4..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-items-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
deleted file mode 100644
index f78272882e29..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-items-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
deleted file mode 100644
index a7c66811dfff..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-items-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
deleted file mode 100644
index b9486431b513..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-auto-placement-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
deleted file mode 100644
index f095a85a6693..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-auto-placement-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
deleted file mode 100644
index 0af58f89cfb6..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-auto-placement-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
deleted file mode 100644
index 4a5c190ed572..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-auto-placement-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
deleted file mode 100644
index 11d843c245cf..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-auto-placement-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
deleted file mode 100644
index 77a54b6c8d07..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-painting-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
deleted file mode 100644
index 6af7051fa353..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-painting-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
deleted file mode 100644
index 8f7a44791f4d..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-painting-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
deleted file mode 100644
index 138b00b1f3ea..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-painting-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
deleted file mode 100644
index 713545207e36..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-order-property-painting-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
deleted file mode 100644
index 250e778eec42..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
deleted file mode 100644
index a10df1f2c9a3..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
deleted file mode 100644
index 0e05e00ac083..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
deleted file mode 100644
index 0ec898ebaf1a..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
deleted file mode 100644
index e407f4c1177b..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
deleted file mode 100644
index 1b8b9aef213f..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
deleted file mode 100644
index 9c3cf0a9dd37..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
deleted file mode 100644
index 575d500f8ccb..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
deleted file mode 100644
index fa6339fd1e28..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
deleted file mode 100644
index 25f4542c82fb..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
deleted file mode 100644
index 9bc27cdc78ef..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-z-axis-ordering-overlapped-items-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
deleted file mode 100644
index da5ba687eae2..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-items-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
deleted file mode 100644
index 699aa8067689..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-items-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
deleted file mode 100644
index 6c940f115938..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-items-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
deleted file mode 100644
index 41048867d486..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-minimum-size-grid-items-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
deleted file mode 100644
index 5ffe3bf2e5ea..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-minimum-size-grid-items-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
deleted file mode 100644
index d07369bdd993..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-auto-placement-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
deleted file mode 100644
index 9ca88b82c0f6..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-auto-placement-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
deleted file mode 100644
index a7050789e400..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-auto-placement-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
deleted file mode 100644
index 53217a44cdec..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-auto-placement-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
deleted file mode 100644
index 4204226e9993..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-auto-placement-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
deleted file mode 100644
index 34558e5239fd..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-painting-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
deleted file mode 100644
index 486e9a6cc039..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-painting-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
deleted file mode 100644
index 14decb72bcce..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-painting-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
deleted file mode 100644
index 1e17ab36a59b..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-painting-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
deleted file mode 100644
index aba943193e59..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-order-property-painting-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
deleted file mode 100644
index f3ea468270d2..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
deleted file mode 100644
index ace8b311a070..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
deleted file mode 100644
index 360fc666ea8e..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
deleted file mode 100644
index 07bc96b3fae3..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
deleted file mode 100644
index 7b9b07f40f83..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
deleted file mode 100644
index 888e6d58b380..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
deleted file mode 100644
index e666c13580d8..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
deleted file mode 100644
index 61441e289f25..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
deleted file mode 100644
index 7f23b2911d47..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
deleted file mode 100644
index 5927d89f3310..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
deleted file mode 100644
index 9b6a03ca566d..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-z-axis-ordering-overlapped-items-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
deleted file mode 100644
index cefea58027f9..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-display-grid-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
deleted file mode 100644
index 8f955b9ab0b8..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-inline-vertical-align-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
deleted file mode 100644
index 8b720f497199..000000000000
--- a/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-vertical-align-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
deleted file mode 100644
index dac72b44c828..000000000000
--- a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-percent-cols-filled-shrinkwrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
deleted file mode 100644
index 91d4e9378071..000000000000
--- a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[grid-percent-cols-spanned-shrinkwrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
deleted file mode 100644
index 661a6ae39c59..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-basic-001.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
deleted file mode 100644
index 88b4413982c3..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-basic-002.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
deleted file mode 100644
index 7c1504077126..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-basic-003.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
deleted file mode 100644
index af41d8a8dcaf..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-basic-004.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
deleted file mode 100644
index 71ed8b062aba..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-block-no-clip-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
deleted file mode 100644
index e3f0e248fc07..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-block-no-clip-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
deleted file mode 100644
index 7176a5b24183..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-clip-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
deleted file mode 100644
index 89c756dd4a61..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-clip-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
deleted file mode 100644
index 5477a6a431fc..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-collapsing-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
deleted file mode 100644
index 2decedec7de6..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
deleted file mode 100644
index b05adb6bc418..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
deleted file mode 100644
index d34d3fcdc8e3..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
deleted file mode 100644
index 7e8b1b612f73..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
deleted file mode 100644
index 79d012d08240..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
deleted file mode 100644
index 9a7793204ae3..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-006.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
deleted file mode 100644
index 69c790ff65fa..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-007.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
deleted file mode 100644
index b8aeda0a9df2..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-invalid-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
deleted file mode 100644
index 64bec1f10b0c..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-invalid-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
deleted file mode 100644
index c6ae4cb18418..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-columns-toolong-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
deleted file mode 100644
index 686d4a3faac7..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-containing-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
deleted file mode 100644
index bd346a3f180f..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-containing-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
deleted file mode 100644
index 19a50721388c..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
deleted file mode 100644
index 7925f06137b7..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
deleted file mode 100644
index 8e19b0b1c24b..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-computed-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
deleted file mode 100644
index c77515421e9b..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-computed-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
deleted file mode 100644
index eeeda7e5732b..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-computed-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
deleted file mode 100644
index 8a4c287b1cae..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-negative-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
deleted file mode 100644
index 004ceb9b0428..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-negative-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
deleted file mode 100644
index 7066d81ead81..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-non-integer-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
deleted file mode 100644
index ef9e0f199a0b..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-non-integer-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
deleted file mode 100644
index a3147f6715a3..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-count-non-integer-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
deleted file mode 100644
index 16b7e1278340..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-fill-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
deleted file mode 100644
index 4a351718d8f7..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-fill-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
deleted file mode 100644
index 030298c9c8f0..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-fill-auto-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
deleted file mode 100644
index 97c6a8333083..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-fill-auto-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
deleted file mode 100644
index a189fc87db27..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-fill-balance-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
deleted file mode 100644
index 499aa1362b30..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
deleted file mode 100644
index cca2892b462d..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
deleted file mode 100644
index 296549ae7af8..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
deleted file mode 100644
index d27716b867fa..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
deleted file mode 100644
index 1caf97bb0e8e..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-fraction-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
deleted file mode 100644
index 5edae168dffb..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-large-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
deleted file mode 100644
index bb760ee1c49e..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-large-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
deleted file mode 100644
index c52592a14eca..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-gap-negative-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
deleted file mode 100644
index d633be264028..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-height-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
deleted file mode 100644
index d49a5286c591..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-inherit-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
deleted file mode 100644
index 35c8ed158ad0..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-inherit-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
deleted file mode 100644
index 5f73ce06f3c2..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-margin-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
deleted file mode 100644
index cc6188ab38b9..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-margin-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
deleted file mode 100644
index 2ab9913daf47..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-margin-child-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
deleted file mode 100644
index 7c6716e74e08..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
deleted file mode 100644
index f1f88ea94840..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
deleted file mode 100644
index 3727be9c6e19..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-margin-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
deleted file mode 100644
index 2716a943264e..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-margin-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
deleted file mode 100644
index 7ef03e9d7412..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-margin-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
deleted file mode 100644
index 27ffe2ae64cf..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-margin-004.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
deleted file mode 100644
index a32d8a639284..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-nested-margin-005.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
deleted file mode 100644
index b9f986759b6a..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-overflowing-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
deleted file mode 100644
index 604198c1a126..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-reduce-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
deleted file mode 100644
index 7dc322c85ed5..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
deleted file mode 100644
index 4f5d50f8525f..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
deleted file mode 100644
index 3721d9a153b4..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
deleted file mode 100644
index e356017f507f..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
deleted file mode 100644
index 311013bf6591..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-color-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
deleted file mode 100644
index abb2b1686da1..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-color-inherit-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
deleted file mode 100644
index 1599b5e7671e..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-color-inherit-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
deleted file mode 100644
index b4ffc5afc604..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-dashed-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
deleted file mode 100644
index 9926e477248a..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-dotted-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
deleted file mode 100644
index 551887898d92..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-double-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
deleted file mode 100644
index 0ec07d1d2b26..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-fraction-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
deleted file mode 100644
index 8acd4c7884b3..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-fraction-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
deleted file mode 100644
index 5549ee75a169..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-fraction-003.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
deleted file mode 100644
index f1ddbe8439b4..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-groove-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
deleted file mode 100644
index 005aaf4f4ae0..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-inset-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
deleted file mode 100644
index 974cc555ebe8..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-large-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
deleted file mode 100644
index 97a62ace6427..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-outset-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
deleted file mode 100644
index 6839e0449b91..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-percent-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
deleted file mode 100644
index 11064dd345c5..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-px-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
deleted file mode 100644
index dd1cd3fcb880..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-ridge-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
deleted file mode 100644
index 175a98c77ec5..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-shorthand-2.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
deleted file mode 100644
index 37da08a114ba..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-solid-000.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
deleted file mode 100644
index ed102d9eabdb..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-rule-stacking-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
deleted file mode 100644
index 4b627f7c43d6..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-shorthand-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
deleted file mode 100644
index 538c4a9d68d4..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-span-none-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
deleted file mode 100644
index 44d2d8cb57bb..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
deleted file mode 100644
index 0668d92d1210..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
deleted file mode 100644
index d15189a26435..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-count-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
deleted file mode 100644
index a1761f54e00e..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-count-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
deleted file mode 100644
index 198e8066483b..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-invalid-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
deleted file mode 100644
index 622447c429cd..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-large-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
deleted file mode 100644
index 71af763bedd6..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-large-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
deleted file mode 100644
index 91c107f0a6c9..000000000000
--- a/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[multicol-width-negative-001.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini b/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
deleted file mode 100644
index 449578b7202e..000000000000
--- a/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-sticky-inline.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini b/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
deleted file mode 100644
index 70ed4bc89436..000000000000
--- a/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[position-sticky-nested-inline.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini b/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
index e4612c1fb304..47f83be1626c 100644
--- a/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
@@ -1,3 +1,4 @@
 [marker-inherit-line-height.html]
   expected:
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
deleted file mode 100644
index 95fee2d29841..000000000000
--- a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[regions-resizing-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
deleted file mode 100644
index 8fcee74c3ac7..000000000000
--- a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[regions-resizing-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
deleted file mode 100644
index 7893792b6b56..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
deleted file mode 100644
index d17b4377edfc..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
deleted file mode 100644
index 7afff5c19a3c..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
deleted file mode 100644
index 6e17ca1acca3..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
deleted file mode 100644
index 30f4e6afcb4d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
deleted file mode 100644
index a74a9cd7100c..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-008.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
deleted file mode 100644
index a1d5b3d37317..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-box-009.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
deleted file mode 100644
index 6e8f2d2f810d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-000.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
deleted file mode 100644
index db12d303726e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
deleted file mode 100644
index c2c8bd6a0263..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
deleted file mode 100644
index e48d5cca19ea..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
deleted file mode 100644
index 9189cda390ed..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
deleted file mode 100644
index fe076673e6ce..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
deleted file mode 100644
index 73a6832b1c4e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
deleted file mode 100644
index 52b97fb12f08..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
deleted file mode 100644
index 465ac4a6424e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-008.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
deleted file mode 100644
index 5f0fff4af6a6..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-009.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
deleted file mode 100644
index 2fc9244b10bd..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
deleted file mode 100644
index 7497ee317f0f..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
deleted file mode 100644
index e717c4c5f8aa..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
deleted file mode 100644
index 2abc378cdf0f..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
deleted file mode 100644
index 89e1dbfc3f7c..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
deleted file mode 100644
index 38bb0156c399..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
deleted file mode 100644
index dfa75396ce7b..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-016.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
deleted file mode 100644
index dd6481439e73..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-017.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
deleted file mode 100644
index da3ecf575f3b..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-018.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
deleted file mode 100644
index a2b56d8dde0b..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-019.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
deleted file mode 100644
index 0505a3e98741..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-020.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
deleted file mode 100644
index 87558c84caa7..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-021.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
deleted file mode 100644
index 7033ecd1a8cf..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-022.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
deleted file mode 100644
index 1f602cf25af5..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-023.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
deleted file mode 100644
index 170ee2851da1..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-025.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
deleted file mode 100644
index 62250081d6fd..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-026.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
deleted file mode 100644
index f8c1895ef99d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-image-027.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
deleted file mode 100644
index d321faadf28a..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
deleted file mode 100644
index 6b4286e59eed..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
deleted file mode 100644
index 7da471bc8833..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
deleted file mode 100644
index 0b2cd4a187c2..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-016.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
deleted file mode 100644
index 7c26f7958617..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-017.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
deleted file mode 100644
index 88f7252b0796..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-018.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
deleted file mode 100644
index 99434338093d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-019.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
deleted file mode 100644
index 3a06bf7e5db8..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-020.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
deleted file mode 100644
index 3ca921ebecef..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-021.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
deleted file mode 100644
index 2324bcdb3c8d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-022.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
deleted file mode 100644
index e93d36282cda..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-024.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
deleted file mode 100644
index a2209466410d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-025.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
deleted file mode 100644
index 88bae43033a8..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-026.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
deleted file mode 100644
index 701f626b6bd9..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-027.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
deleted file mode 100644
index 3fc928715b74..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-028.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
deleted file mode 100644
index 82ebcaabedb7..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-circle-029.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
deleted file mode 100644
index 7af4e0c9b670..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
deleted file mode 100644
index 6813daf91afc..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
deleted file mode 100644
index d5630c6981cb..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
deleted file mode 100644
index fe4c801a18dd..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-016.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
deleted file mode 100644
index 85fd53a577ff..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-017.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
deleted file mode 100644
index e86a4e0fbb7c..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-018.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
deleted file mode 100644
index fba13ae8ebce..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-019.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
deleted file mode 100644
index 01843144e829..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-020.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
deleted file mode 100644
index 71e4ac9bca21..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-021.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
deleted file mode 100644
index 435779e9ed54..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-022.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
deleted file mode 100644
index faf09b156b0f..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-023.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
deleted file mode 100644
index 32e9e571c7b5..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-024.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
deleted file mode 100644
index 8b2548f012a3..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-ellipse-025.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
deleted file mode 100644
index 3b05372f9698..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
deleted file mode 100644
index 89648f788fb1..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
deleted file mode 100644
index 803ce8ad2c6c..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
deleted file mode 100644
index 279c03ac165e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
deleted file mode 100644
index e5495fdddb9a..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
deleted file mode 100644
index 733f82f62895..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
deleted file mode 100644
index 83baddd95b3d..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-028.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
deleted file mode 100644
index bf44fd50a163..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-029.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
deleted file mode 100644
index 71da0e70b1ff..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-inset-030.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
deleted file mode 100644
index e3cba4dc8cf2..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
deleted file mode 100644
index 0838d13b4bf9..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-008.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
deleted file mode 100644
index 32f008cbd651..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-009.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
deleted file mode 100644
index 1f02aeb1a283..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
deleted file mode 100644
index 8cb42392b4f9..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
deleted file mode 100644
index 2a08cb567fdb..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
deleted file mode 100644
index 59f4f1a2a64b..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
deleted file mode 100644
index c7ce8180be26..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
deleted file mode 100644
index 55845330d50a..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
deleted file mode 100644
index 384b3c4744c3..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-016.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
deleted file mode 100644
index 6cfa74f4353a..000000000000
--- a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-polygon-017.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
deleted file mode 100644
index 95959d6c1d98..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
deleted file mode 100644
index 0c658180b568..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
deleted file mode 100644
index df74f7d3140e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
deleted file mode 100644
index 3648f963777e..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
deleted file mode 100644
index d853d83435b7..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
deleted file mode 100644
index 54a0084846bb..000000000000
--- a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[shape-outside-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
deleted file mode 100644
index ddcc188cb6f6..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[intrinsic-percent-non-replaced-001.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
deleted file mode 100644
index 6e04045ae0d6..000000000000
--- a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[intrinsic-percent-non-replaced-003.html]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
deleted file mode 100644
index fe42e31b2167..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
deleted file mode 100644
index 6a0f1e51e01f..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
deleted file mode 100644
index f7c3cfd6891a..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
deleted file mode 100644
index e59d1eeca186..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
deleted file mode 100644
index 82270c204d76..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
deleted file mode 100644
index bf4e3fb154c1..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
deleted file mode 100644
index b6b5df5945b8..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
deleted file mode 100644
index 359bd78262f4..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-008.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
deleted file mode 100644
index 03285108067e..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-009.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
deleted file mode 100644
index aa7cef46afdf..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
deleted file mode 100644
index e73cbd449107..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
deleted file mode 100644
index 4bcb2e600cb5..000000000000
--- a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-breaking-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
deleted file mode 100644
index 59d9dcc6dee9..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-wrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
deleted file mode 100644
index c44cfd38b3e8..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-wrap-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
deleted file mode 100644
index 6d09beeb6137..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-wrap-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
deleted file mode 100644
index 4d5bd2588965..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[overflow-wrap-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
deleted file mode 100644
index b5ecfd04622f..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-wrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
deleted file mode 100644
index 056b7d3d9158..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-wrap-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
deleted file mode 100644
index 1bd1d3e71f64..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-wrap-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
deleted file mode 100644
index 06f25e78391c..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[word-wrap-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
deleted file mode 100644
index bcce71e4d95a..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[break-spaces-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
deleted file mode 100644
index 24dbdfda0193..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
deleted file mode 100644
index 4bede7320c15..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
deleted file mode 100644
index 196c91905751..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
deleted file mode 100644
index a37ca94a977c..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
deleted file mode 100644
index f624737aa0ac..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
deleted file mode 100644
index 952091841388..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
deleted file mode 100644
index 06920af0a7ce..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
deleted file mode 100644
index 7345d4f018e2..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
deleted file mode 100644
index 7fd8fe8a9119..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
deleted file mode 100644
index 570bbc69d9c9..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
deleted file mode 100644
index 73938029c158..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[pre-wrap-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
deleted file mode 100644
index a531e7c1f80e..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-break-spaces-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
deleted file mode 100644
index eed15c0626d0..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
deleted file mode 100644
index 9228ded5429a..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
deleted file mode 100644
index 6025fcd6945b..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
deleted file mode 100644
index f3a7421f6442..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
deleted file mode 100644
index 6af32287b0fb..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-005.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
deleted file mode 100644
index 1eac68668071..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-006.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
deleted file mode 100644
index 054192808d5a..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
deleted file mode 100644
index 61090c13d6e7..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
deleted file mode 100644
index 993dc5c2d0df..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-012.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
deleted file mode 100644
index 785f31b16bf9..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
deleted file mode 100644
index 050795092711..000000000000
--- a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[textarea-pre-wrap-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini b/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
deleted file mode 100644
index c31ebad21a3b..000000000000
--- a/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[transform-applies-to-002.xht]
-  expected:
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/outline-004.html.ini b/testing/web-platform/meta/css/css-ui/outline-004.html.ini
deleted file mode 100644
index e764f96e380f..000000000000
--- a/testing/web-platform/meta/css/css-ui/outline-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[outline-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
deleted file mode 100644
index 50a98f396772..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
deleted file mode 100644
index 88f28edf5479..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-002.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
deleted file mode 100644
index b9de1cfaad54..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-003.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
deleted file mode 100644
index 6b6e2b4e7d48..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-004.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
deleted file mode 100644
index b7399df116ca..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-007.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
deleted file mode 100644
index 248f72f406e4..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-010.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
deleted file mode 100644
index 4c198e282be8..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-011.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
deleted file mode 100644
index ff57afdea067..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-013.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
deleted file mode 100644
index 3922a7aeaee5..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-014.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
deleted file mode 100644
index 1a6e0123d785..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-015.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
deleted file mode 100644
index 9126d02ed318..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-016.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
deleted file mode 100644
index 8cb86a7d3ba7..000000000000
--- a/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-overflow-020.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini b/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
deleted file mode 100644
index f8930e5f7fd1..000000000000
--- a/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[vars-font-shorthand-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
deleted file mode 100644
index a0e90c127819..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
deleted file mode 100644
index 477a2e885776..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
deleted file mode 100644
index 5fb319dbef83..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
deleted file mode 100644
index 4825f658c0f9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
deleted file mode 100644
index 881ef49fc1fa..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
deleted file mode 100644
index 5f2d048505b7..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
deleted file mode 100644
index 4e5e3fc50423..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-021.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
deleted file mode 100644
index 4c8eed8c90bc..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-023.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
deleted file mode 100644
index db958a541be6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-027.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
deleted file mode 100644
index 61e6a5188a19..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-029.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
deleted file mode 100644
index f14bdff33b59..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-033.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
deleted file mode 100644
index c72dbc63f213..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-035.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
deleted file mode 100644
index 53b4a0db3b20..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-039.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
deleted file mode 100644
index faf979030585..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-041.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
deleted file mode 100644
index 25b66ffd9b14..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-045.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
deleted file mode 100644
index f4d55003e652..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-047.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
deleted file mode 100644
index 2d1557dd4809..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-051.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
deleted file mode 100644
index f41e134fe3b0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-053.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
deleted file mode 100644
index 9c0b5bd82482..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-057.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
deleted file mode 100644
index c175e8169420..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-059.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
deleted file mode 100644
index 8e7d46e17fdf..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-063.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
deleted file mode 100644
index d54173f2a3f3..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-065.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
deleted file mode 100644
index 0e256a5163b4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-069.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
deleted file mode 100644
index 1dd94425beee..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-071.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
deleted file mode 100644
index 998ae6424701..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-075.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
deleted file mode 100644
index b7e34c466f5e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-077.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
deleted file mode 100644
index 57deec08783a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-081.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
deleted file mode 100644
index 7324aa6873ba..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-083.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
deleted file mode 100644
index 5193245373aa..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-087.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
deleted file mode 100644
index f19921250af5..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-089.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
deleted file mode 100644
index ded6fee05a92..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-093.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
deleted file mode 100644
index 5698373d32b8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-095.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
deleted file mode 100644
index 665a776425cd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-103.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
deleted file mode 100644
index 7a2f078ab922..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-105.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
deleted file mode 100644
index 675d546652d8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-109.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
deleted file mode 100644
index 20e282424d96..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-111.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
deleted file mode 100644
index 1bba1f584157..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-113.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
deleted file mode 100644
index 20d1aa59b067..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-117.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
deleted file mode 100644
index f9e4627916f9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-119.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
deleted file mode 100644
index 0df3ceb47e8e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-121.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
deleted file mode 100644
index ee47c517469b..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-125.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
deleted file mode 100644
index 34d3c374b49e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-127.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
deleted file mode 100644
index 62fb5eff609d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-129.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
deleted file mode 100644
index 531ad8df1192..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-133.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
deleted file mode 100644
index a8759d335de2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-135.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
deleted file mode 100644
index 520eb6d23737..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-137.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
deleted file mode 100644
index 0e42660fec11..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-141.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
deleted file mode 100644
index d135a395388c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-143.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
deleted file mode 100644
index 8b574992f644..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-145.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
deleted file mode 100644
index 087452da6ab8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-149.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
deleted file mode 100644
index 5f073070c8ab..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-151.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
deleted file mode 100644
index 09917204d94a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-153.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
deleted file mode 100644
index ccf7f1c0b780..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-157.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
deleted file mode 100644
index d053c1263eef..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-159.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
deleted file mode 100644
index 733df616890f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-161.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
deleted file mode 100644
index 31908b958ca1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-165.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
deleted file mode 100644
index a410332b0f70..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-167.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
deleted file mode 100644
index 50c29d9eff63..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-169.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
deleted file mode 100644
index 589cf1cc64b9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-173.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
deleted file mode 100644
index aa47b3f183eb..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-175.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
deleted file mode 100644
index 8d54a0c2e3c1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-177.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
deleted file mode 100644
index ea8f7dedfe6e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-181.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
deleted file mode 100644
index 7a4dede2f2a0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-183.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
deleted file mode 100644
index 589f8419b748..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-185.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
deleted file mode 100644
index a215faeefe94..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-189.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
deleted file mode 100644
index 155f7c693094..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-191.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
deleted file mode 100644
index c1235b7be607..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-193.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
deleted file mode 100644
index 5732d1c4a52d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-197.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
deleted file mode 100644
index ab988402025f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-199.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
deleted file mode 100644
index 87a18d525cda..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-201.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
deleted file mode 100644
index 08269ef2aad8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-205.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
deleted file mode 100644
index 6f0e2c3e3f75..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-207.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
deleted file mode 100644
index 39dfb550fbd5..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-209.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
deleted file mode 100644
index 82a591ffbc29..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-213.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
deleted file mode 100644
index 6b1458b49949..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-215.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
deleted file mode 100644
index fdd77f06afa8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-217.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
deleted file mode 100644
index 92bbe428f09c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-221.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
deleted file mode 100644
index 970e0e62cb3d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-223.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
deleted file mode 100644
index 1002ed819485..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-225.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
deleted file mode 100644
index 5401423e85ac..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vlr-229.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
deleted file mode 100644
index 77628887a99e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
deleted file mode 100644
index fe91f9998a22..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
deleted file mode 100644
index df7c6aae3dde..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
deleted file mode 100644
index c87e2b70df79..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
deleted file mode 100644
index 4997d8fcdfda..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
deleted file mode 100644
index 9939999d54bd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
deleted file mode 100644
index 97a3f41b33be..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
deleted file mode 100644
index ab0264565a58..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-022.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
deleted file mode 100644
index 7e306eac904d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-026.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
deleted file mode 100644
index c8c2dae330bd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-028.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
deleted file mode 100644
index ff9155388244..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-032.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
deleted file mode 100644
index 1d149ad167f1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-034.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
deleted file mode 100644
index 15dcc952ce90..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-038.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
deleted file mode 100644
index 15279c458b53..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-040.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
deleted file mode 100644
index c2ebb74fa659..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-044.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
deleted file mode 100644
index 68e84fdd24a9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-046.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
deleted file mode 100644
index 146860ce119c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-050.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
deleted file mode 100644
index 48d23dda78b6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-052.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
deleted file mode 100644
index 95a8e4eaea86..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-056.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
deleted file mode 100644
index a00892b6dc53..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-058.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
deleted file mode 100644
index feb844c9ea92..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-062.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
deleted file mode 100644
index 2b7d16ae94c1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-064.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
deleted file mode 100644
index f1e9f1d88c26..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-068.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
deleted file mode 100644
index da1b9838f44a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-070.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
deleted file mode 100644
index 126425d0dd91..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-074.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
deleted file mode 100644
index ca7169863354..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-076.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
deleted file mode 100644
index 71df81237d19..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-080.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
deleted file mode 100644
index 8da8ab32af30..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-082.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
deleted file mode 100644
index d0d903efeb99..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-086.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
deleted file mode 100644
index a4074afb58a1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-088.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
deleted file mode 100644
index 3ad7d37d838e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-092.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
deleted file mode 100644
index 8d801bdb3b2f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-094.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
deleted file mode 100644
index dc6151148d44..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-102.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
deleted file mode 100644
index 0ba070ebd8f4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-104.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
deleted file mode 100644
index 88e8ba0c0f63..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-108.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
deleted file mode 100644
index 8f18a1f631a2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-110.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
deleted file mode 100644
index c79f7d5e8585..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-112.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
deleted file mode 100644
index 477b02dd5a9c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-116.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
deleted file mode 100644
index b5ecbb511e72..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-118.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
deleted file mode 100644
index 3db7ee989730..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-120.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
deleted file mode 100644
index 8fe3f3cf405b..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-124.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
deleted file mode 100644
index c377bac1a23e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-126.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
deleted file mode 100644
index eecf28cbf1e4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-128.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
deleted file mode 100644
index 1d3552cfe355..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-132.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
deleted file mode 100644
index 06a0a56d0f6c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-134.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
deleted file mode 100644
index 66b954b974e9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-136.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
deleted file mode 100644
index 28bce9d51e03..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-140.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
deleted file mode 100644
index 37734b339195..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-142.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
deleted file mode 100644
index 6a5b0a46d57f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-144.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
deleted file mode 100644
index 13c2323f74c1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-148.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
deleted file mode 100644
index 15b7b04423d6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-150.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
deleted file mode 100644
index 03ac77b089d5..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-152.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
deleted file mode 100644
index 5a85b287155e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-156.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
deleted file mode 100644
index a5ef150acc3a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-158.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
deleted file mode 100644
index 8b66003798b0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-160.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
deleted file mode 100644
index 51372950ad40..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-164.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
deleted file mode 100644
index 080493e778b9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-166.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
deleted file mode 100644
index 460b6c67ce03..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-168.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
deleted file mode 100644
index ed850eb0e822..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-172.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
deleted file mode 100644
index fb3c940d7bd2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-174.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
deleted file mode 100644
index 1c4a8ed3e65f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-176.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
deleted file mode 100644
index f7dcce0b1ebd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-180.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
deleted file mode 100644
index 1d21b819cd4d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-182.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
deleted file mode 100644
index bccc92794ad4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-184.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
deleted file mode 100644
index 20f5700a9d36..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-188.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
deleted file mode 100644
index d5a982f98ea2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-190.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
deleted file mode 100644
index fdd10980af37..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-192.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
deleted file mode 100644
index 1c7a03f75a11..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-196.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
deleted file mode 100644
index d556f5a3a898..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-198.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
deleted file mode 100644
index 2dd8359f79d2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-200.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
deleted file mode 100644
index 028176c51f78..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-204.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
deleted file mode 100644
index 48d70d8b68d4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-206.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
deleted file mode 100644
index b629b7b1676b..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-208.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
deleted file mode 100644
index 2f0d2d8e5477..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-212.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
deleted file mode 100644
index 1f9b89b66af8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-214.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
deleted file mode 100644
index 626fe1d045fc..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-216.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
deleted file mode 100644
index 359b15ad72a4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-220.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
deleted file mode 100644
index 68db2741b0f9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-222.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
deleted file mode 100644
index 9036edc12a8e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-224.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
deleted file mode 100644
index 5809421c490f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[abs-pos-non-replaced-vrl-228.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
deleted file mode 100644
index 4620a725e59e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
deleted file mode 100644
index c33e7343f164..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-htb-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
deleted file mode 100644
index 263eb784ce10..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
deleted file mode 100644
index 5b54631875be..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-047.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
deleted file mode 100644
index 326e4a9fb40a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-048.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
deleted file mode 100644
index 4e780abb699c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-050.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
deleted file mode 100644
index f9b72b143e29..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-054.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
deleted file mode 100644
index d762e6032bfa..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-055.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
deleted file mode 100644
index 9e43ced0a3f2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-056.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
deleted file mode 100644
index cafd04526ee6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-060.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
deleted file mode 100644
index 1aa841f2d988..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-062.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
deleted file mode 100644
index bfd754880d50..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-slr-063.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
deleted file mode 100644
index 937297c10fd2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-042.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
deleted file mode 100644
index dde24a8ed6f2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-045.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
deleted file mode 100644
index 1a896b155f77..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-046.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
deleted file mode 100644
index 370828e579ad..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
deleted file mode 100644
index 88674ac79dc2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-051.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
deleted file mode 100644
index ca3d68207982..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-052.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
deleted file mode 100644
index 493cb28a35a8..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-053.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
deleted file mode 100644
index a26f763805f6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-059.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
deleted file mode 100644
index 47a993d00ef4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-061.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
deleted file mode 100644
index 710c42feaa7c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-srl-064.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
deleted file mode 100644
index 08b885b46e18..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
deleted file mode 100644
index a3734e3b5b79..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
deleted file mode 100644
index 58e62cdd128c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
deleted file mode 100644
index fcf0e4eca740..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
deleted file mode 100644
index d1f29014d96e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
deleted file mode 100644
index cdcfbb2364f4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
deleted file mode 100644
index cb7e259a9ecb..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
deleted file mode 100644
index 500f528c6ab4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
deleted file mode 100644
index ce6fcfe8894d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-022.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
deleted file mode 100644
index d445f998823c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vlr-023.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
deleted file mode 100644
index 328aacd19fdd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
deleted file mode 100644
index 22c6a1aa9e1d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
deleted file mode 100644
index 09997273c60a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
deleted file mode 100644
index e873ceb006f1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
deleted file mode 100644
index 157c852b8a0e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
deleted file mode 100644
index b55a70dfcb26..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
deleted file mode 100644
index f3c60fdf2fc3..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
deleted file mode 100644
index 4b2540e8af0a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
deleted file mode 100644
index 683a2b5cc235..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-021.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
deleted file mode 100644
index 0be540a7870d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[block-flow-direction-vrl-024.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
deleted file mode 100644
index 5ec111287f13..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[central-baseline-alignment-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
deleted file mode 100644
index 34a78e97b51b..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[central-baseline-alignment-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
deleted file mode 100644
index 14deacf7c2c2..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[float-contiguous-vlr-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
deleted file mode 100644
index 7f77b36e2f19..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[float-contiguous-vrl-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
new file mode 100644
index 000000000000..ed213633f7fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
@@ -0,0 +1,14 @@
+[height-width-inline-non-replaced-vlr-003.xht]
+  expected:
+    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 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 not webrender and e10s and (os == "win") and (version == "6.1.7601") 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 == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
+    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
new file mode 100644
index 000000000000..3fd0a69b694f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
@@ -0,0 +1,14 @@
+[height-width-inline-non-replaced-vrl-002.xht]
+  expected:
+    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 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 not webrender and e10s and (os == "win") and (version == "6.1.7601") 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 == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
+    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
deleted file mode 100644
index 0b017dbed3f0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-block-alignment-orthogonal-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
deleted file mode 100644
index e719ae4a0bad..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-block-alignment-orthogonal-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
deleted file mode 100644
index b0fdff5ec22e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-block-alignment-orthogonal-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
deleted file mode 100644
index cef837fe6412..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[inline-block-alignment-orthogonal-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
deleted file mode 100644
index 415d1b85abc5..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-htb-001.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
deleted file mode 100644
index 849879114dfa..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-043.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
deleted file mode 100644
index d33df5dc9b5d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-047.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
deleted file mode 100644
index 8dd4d1573f0f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-048.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
deleted file mode 100644
index 8489d85267bb..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-050.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
deleted file mode 100644
index 4da66444857d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-053.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
deleted file mode 100644
index 01100b232c68..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-054.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
deleted file mode 100644
index 97d63035851c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-058.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
deleted file mode 100644
index 0cfff4d02359..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-slr-060.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
deleted file mode 100644
index a8570bfd034e..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-042.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
deleted file mode 100644
index 5dd7f51744a0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-045.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
deleted file mode 100644
index 28066e79d665..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-046.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
deleted file mode 100644
index a0f33007eef7..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-049.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
deleted file mode 100644
index 4466ffc3bd75..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-051.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
deleted file mode 100644
index 02dc64e150fc..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-052.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
deleted file mode 100644
index 640ed3a5a0ff..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-057.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
deleted file mode 100644
index 835cafa57697..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-srl-059.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
deleted file mode 100644
index ccfa202bed12..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
deleted file mode 100644
index b625ec291ee3..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
deleted file mode 100644
index b0db01710cda..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
deleted file mode 100644
index 3c7884f3b832..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-010.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
deleted file mode 100644
index 0bf20afe4ed0..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-013.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
deleted file mode 100644
index 6a4dd6006525..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
deleted file mode 100644
index ac95aaf6f1c5..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-018.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
deleted file mode 100644
index d0b58095c243..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vlr-020.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
deleted file mode 100644
index a09ea5c8e17d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
deleted file mode 100644
index 87d38b8fa77a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
deleted file mode 100644
index 1cb6cbd174bf..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
deleted file mode 100644
index 2d6d05c5cf7b..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
deleted file mode 100644
index 7a29a1841f82..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-011.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
deleted file mode 100644
index 8bd6a2f3b2f1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-012.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
deleted file mode 100644
index 51f77180e129..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
deleted file mode 100644
index 08261b110e08..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[line-box-direction-vrl-019.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
deleted file mode 100644
index fd2e720be1a6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-slr-023.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
deleted file mode 100644
index 160313088a87..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-slr-029.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
deleted file mode 100644
index df13f0d12541..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-srl-022.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
deleted file mode 100644
index ac02a359ff33..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-srl-028.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
deleted file mode 100644
index 4b78544ac866..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
deleted file mode 100644
index 0eb5fb038303..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
deleted file mode 100644
index ab50a800275a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vlr-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
deleted file mode 100644
index 91447fd63f58..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vlr-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
deleted file mode 100644
index 2ec5112059a9..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
deleted file mode 100644
index 88d69b56cbe4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
deleted file mode 100644
index 8309493ff2f4..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vrl-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
deleted file mode 100644
index a08645d29ffd..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[row-progression-vrl-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
deleted file mode 100644
index 6c40708ecb49..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
deleted file mode 100644
index 250820c844ff..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
deleted file mode 100644
index f12b1205896c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
deleted file mode 100644
index 26fad8e1f382..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
deleted file mode 100644
index 32da10f9e127..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-slr-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
deleted file mode 100644
index 1f4c6853c37d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[table-column-order-srl-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
deleted file mode 100644
index cd28e4320ee6..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-baseline-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
deleted file mode 100644
index 82daea13ba67..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-baseline-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini b/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
deleted file mode 100644
index 6c766ff2c2d7..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-combine-upright-layout-rules-001.html]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
deleted file mode 100644
index f830e4eb851c..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-003.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
deleted file mode 100644
index 4a0cea76cb21..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-005.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
deleted file mode 100644
index d18e5bf7704d..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-007.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
deleted file mode 100644
index 1d481d9e3c41..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-009.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
deleted file mode 100644
index a7eb31ea3705..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-015.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
deleted file mode 100644
index a8be8ec67864..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vlr-017.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
deleted file mode 100644
index 1bdb648be919..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-002.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
deleted file mode 100644
index 35088d3d2582..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-004.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
deleted file mode 100644
index 8a8efb5cb528..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-006.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
deleted file mode 100644
index 7db63ff98704..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-008.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
deleted file mode 100644
index ea53923bf3f1..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-014.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini
deleted file mode 100644
index 989656da234a..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[text-indent-vrl-016.xht]
-  expected:
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
index 08bee8e967e5..bf30b57a1b54 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
@@ -1,2 +1,4 @@
 [object-position-svg-002e.html]
-  expected: FAIL
+  expected:
+    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
+    FAIL

From 2cab1ab0a7f97e02270e7486beffd1c4e16bad1f Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 7 Nov 2018 16:53:25 +0000
Subject: [PATCH 14/77] Bug 1504979 part 1 - Use offset to 'default' target
 instead of zero in JSOP_TABLESWITCH offsets. r=nbp

With this change we no longer have to handle the offset == 0 case everywhere.

Differential Revision: https://phabricator.services.mozilla.com/D11018

--HG--
extra : moz-landing-system : lando
---
 js/src/frontend/SwitchEmitter.cpp        |  2 +-
 js/src/jit-test/tests/coverage/simple.js |  4 ++--
 js/src/jit/BaselineIC.cpp                |  7 +------
 js/src/jit/BytecodeAnalysis.cpp          |  2 +-
 js/src/jit/IonControlFlow.cpp            |  7 ++-----
 js/src/vm/BytecodeLocation.h             |  2 --
 js/src/vm/BytecodeUtil.cpp               |  2 +-
 js/src/vm/CodeCoverage.cpp               | 22 +++++++++-------------
 js/src/vm/Interpreter.cpp                |  5 +----
 js/src/vm/JSScript.cpp                   |  4 ++--
 js/src/vm/Opcodes.h                      |  3 +--
 11 files changed, 21 insertions(+), 39 deletions(-)

diff --git a/js/src/frontend/SwitchEmitter.cpp b/js/src/frontend/SwitchEmitter.cpp
index 696199a27f18..71ed2779af62 100644
--- a/js/src/frontend/SwitchEmitter.cpp
+++ b/js/src/frontend/SwitchEmitter.cpp
@@ -455,7 +455,7 @@ SwitchEmitter::emitEnd()
         // Fill in the jump table, if there is one.
         for (uint32_t i = 0, length = caseOffsets_.length(); i < length; i++) {
             ptrdiff_t off = caseOffsets_[i];
-            SET_JUMP_OFFSET(pc, off == 0 ? 0 : off - top_);
+            SET_JUMP_OFFSET(pc, (off != 0 ? off : defaultJumpTargetOffset_.offset) - top_);
             pc += JUMP_OFFSET_LEN;
         }
     }
diff --git a/js/src/jit-test/tests/coverage/simple.js b/js/src/jit-test/tests/coverage/simple.js
index 0383642c1902..064b37cecd82 100644
--- a/js/src/jit-test/tests/coverage/simple.js
+++ b/js/src/jit-test/tests/coverage/simple.js
@@ -353,7 +353,7 @@ checkLcov(function () { //FN:$,top-level //FNDA:1,%
 
 checkLcov(function () { //FN:$,top-level //FNDA:1,%
   var l = ",".split(','); //DA:$,1
-  switch (l.length) {     //DA:$,1 //BRDA:$,0,0,0 //BRDA:$,0,1,0 //BRDA:$,0,2,1
+  switch (l.length) {     //DA:$,1 //BRDA:$,0,0,0 //BRDA:$,0,1,1 //BRDA:$,0,2,0
     case 3:
       l.push('1');        //DA:$,0
     case 5:
@@ -501,7 +501,7 @@ checkLcov(function () { //FN:$,top-level //FNDA:1,%
 
 checkLcov(function () { //FN:$,top-level //FNDA:1,%
   var l = ",".split(','); //DA:$,1
-  switch (l.length) {     //DA:$,1 //BRDA:$,0,0,0 //BRDA:$,0,1,0 //BRDA:$,0,2,0 //BRDA:$,0,3,1
+  switch (l.length) {     //DA:$,1 //BRDA:$,0,0,0 //BRDA:$,0,1,0 //BRDA:$,0,2,1 //BRDA:$,0,3,0
     case 0:
       l.push('0');        //DA:$,0
     case 1:
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index eb1eee210f65..3ce77a9b9613 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -5208,12 +5208,7 @@ ICTableSwitch::Compiler::getStub(ICStubSpace* space)
     jsbytecode* defaultpc = pc_ + GET_JUMP_OFFSET(pc_);
 
     for (int32_t i = 0; i < length; i++) {
-        int32_t off = GET_JUMP_OFFSET(pc);
-        if (off) {
-            table[i] = pc_ + off;
-        } else {
-            table[i] = defaultpc;
-        }
+        table[i] = pc_ + GET_JUMP_OFFSET(pc);
         pc += JUMP_OFFSET_LEN;
     }
 
diff --git a/js/src/jit/BytecodeAnalysis.cpp b/js/src/jit/BytecodeAnalysis.cpp
index 29be1be9e107..ec0a2680df57 100644
--- a/js/src/jit/BytecodeAnalysis.cpp
+++ b/js/src/jit/BytecodeAnalysis.cpp
@@ -107,7 +107,7 @@ BytecodeAnalysis::init(TempAllocator& alloc, GSNCache& gsn)
 
             for (int32_t i = low; i <= high; i++) {
                 unsigned targetOffset = offset + GET_JUMP_OFFSET(pc2);
-                if (targetOffset != offset) {
+                if (targetOffset != defaultOffset) {
                     infos_[targetOffset].init(stackDepth);
                     infos_[targetOffset].jumpTarget = true;
                 }
diff --git a/js/src/jit/IonControlFlow.cpp b/js/src/jit/IonControlFlow.cpp
index 5099d8549797..c9b904c50f2e 100644
--- a/js/src/jit/IonControlFlow.cpp
+++ b/js/src/jit/IonControlFlow.cpp
@@ -1951,11 +1951,8 @@ ControlFlowGenerator::processTableSwitch(JSOp op, jssrcnote* sn)
         MOZ_ASSERT(casepc >= pc && casepc <= exitpc);
         CFGBlock* caseBlock;
 
-        if (casepc == pc) {
-            // If the casepc equals the current pc, it is not a written case,
-            // but a filled gap. That way we can use a tableswitch instead of
-            // condswitch, even if not all numbers are consecutive.
-            // In that case this block goes to the default case
+        if (casepc == defaultpc) {
+            // This is a missing case. Jump to the 'default' target.
             caseBlock = CFGBlock::New(alloc(), defaultpc);
             caseBlock->setStopIns(CFGGoto::New(alloc(), defaultcase));
         } else {
diff --git a/js/src/vm/BytecodeLocation.h b/js/src/vm/BytecodeLocation.h
index c6c4070b9361..910af1bbe32c 100644
--- a/js/src/vm/BytecodeLocation.h
+++ b/js/src/vm/BytecodeLocation.h
@@ -156,8 +156,6 @@ class BytecodeLocation
 
     // Return the BytecodeLocation referred to by index number in the table
     // of the table switch.
-    //
-    // Returns (effectively) |this| on a gap in the table.
     BytecodeLocation getTableSwitchCaseByIndex(size_t index) const {
         MOZ_ASSERT(is(JSOP_TABLESWITCH));
         RawBytecode offsetLoc = rawBytecode_ +
diff --git a/js/src/vm/BytecodeUtil.cpp b/js/src/vm/BytecodeUtil.cpp
index 4c170b3c4037..f7497a5eff4f 100644
--- a/js/src/vm/BytecodeUtil.cpp
+++ b/js/src/vm/BytecodeUtil.cpp
@@ -928,7 +928,7 @@ BytecodeParser::parse()
 
             for (int32_t i = low; i <= high; i++) {
                 uint32_t targetOffset = offset + GET_JUMP_OFFSET(pc2);
-                if (targetOffset != offset) {
+                if (targetOffset != defaultOffset) {
                     if (!addJump(targetOffset, &nextOffset, stackDepth, offsetStack,
                                  pc, JumpKind::SwitchCase))
                     {
diff --git a/js/src/vm/CodeCoverage.cpp b/js/src/vm/CodeCoverage.cpp
index 23eebfb56aaf..9c15c0438c2c 100644
--- a/js/src/vm/CodeCoverage.cpp
+++ b/js/src/vm/CodeCoverage.cpp
@@ -324,12 +324,12 @@ LCovSource::writeScript(JSScript* script)
 
             // Record branches for each cases.
             size_t caseId = 0;
+            bool tableJumpsToDefault = false;
             for (size_t i = 0; i < numCases; i++) {
                 jsbytecode* casepc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * i);
                 MOZ_ASSERT(script->code() <= casepc && casepc < end);
-                // The case is not present, and jumps to the default pc if used.
-                if (casepc == pc) {
-                    continue;
+                if (casepc == defaultpc) {
+                    tableJumpsToDefault = true;
                 }
 
                 // PCs might not be in increasing order of case indexes.
@@ -393,7 +393,11 @@ LCovSource::writeScript(JSScript* script)
             // Compute the number of hits of the default branch, if it has its
             // own case clause.
             bool defaultHasOwnClause = true;
-            if (defaultpc != exitpc) {
+            if (tableJumpsToDefault) {
+                // The previous loop already encoded the coverage information
+                // for the 'default' block.
+                defaultHasOwnClause = false;
+            } else if (defaultpc != exitpc) {
                 defaultHits = 0;
 
                 // Look for the last case entry before the default pc.
@@ -402,20 +406,12 @@ LCovSource::writeScript(JSScript* script)
                 for (size_t j = 0; j < numCases; j++) {
                     jsbytecode* testpc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * j);
                     MOZ_ASSERT(script->code() <= testpc && testpc < end);
-                    if (lastcasepc < testpc && testpc <= defaultpc) {
+                    if (lastcasepc < testpc && testpc < defaultpc) {
                         lastcasepc = testpc;
                         foundLastCase = true;
                     }
                 }
 
-                // Set defaultHasOwnClause to false, if one of the case
-                // statement has the same pc as the default block. Which implies
-                // that the previous loop already encoded the coverage
-                // information for the current block.
-                if (foundLastCase && lastcasepc == defaultpc) {
-                    defaultHasOwnClause = false;
-                }
-
                 // Look if the last case entry fallthrough to the default case,
                 // in which case we have to remove the number of fallthrough
                 // hits out of the default case hits.
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index 9fcd0c1d1d2b..d08b50d1915d 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -3780,10 +3780,7 @@ CASE(JSOP_TABLESWITCH)
     i = uint32_t(i) - uint32_t(low);
     if ((uint32_t)i < (uint32_t)(high - low + 1)) {
         pc2 += JUMP_OFFSET_LEN + JUMP_OFFSET_LEN * i;
-        int32_t off = (int32_t) GET_JUMP_OFFSET(pc2);
-        if (off) {
-            len = off;
-        }
+        len = GET_JUMP_OFFSET(pc2);
     }
     ADVANCE_AND_DISPATCH(len);
 }
diff --git a/js/src/vm/JSScript.cpp b/js/src/vm/JSScript.cpp
index 639c8debe156..26da312d0c19 100644
--- a/js/src/vm/JSScript.cpp
+++ b/js/src/vm/JSScript.cpp
@@ -3627,8 +3627,8 @@ JSScript::assertValidJumpTargets() const
 
             for (int i = 0; i < high - low + 1; i++) {
                 BytecodeLocation switchCase = loc.getTableSwitchCaseByIndex(i);
-                MOZ_ASSERT_IF(switchCase != loc, mainLoc <= switchCase && switchCase < endLoc);
-                MOZ_ASSERT_IF(switchCase != loc, switchCase.isJumpTarget());
+                MOZ_ASSERT(mainLoc <= switchCase && switchCase < endLoc);
+                MOZ_ASSERT(switchCase.isJumpTarget());
             }
         }
     }
diff --git a/js/src/vm/Opcodes.h b/js/src/vm/Opcodes.h
index 3e8c2bcda1f4..f9c14b830c03 100644
--- a/js/src/vm/Opcodes.h
+++ b/js/src/vm/Opcodes.h
@@ -694,8 +694,7 @@
     macro(JSOP_AND, 69, "and", NULL, 5, 1, 1, JOF_JUMP|JOF_DETECTING|JOF_IC) \
     /*
      * Pops the top of stack value as 'i', if 'low <= i <= high',
-     * jumps to a 32-bit offset: 'offset[i - low]' from the current bytecode,
-     *                           unless the offset is zero (missing case)
+     * jumps to a 32-bit offset: 'offset[i - low]' from the current bytecode
      * jumps to a 32-bit offset: 'len' from the current bytecode otherwise
      *
      * This opcode has variable length.

From 84ff81618c4e6ff4a3b81e2834aa468b1fd22e60 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Thu, 8 Nov 2018 18:28:07 +0000
Subject: [PATCH 15/77] Bug 1504979 part 2 - Use resumeIndex/resumeOffsets for
 JSOP_TABLESWITCH. r=tcampbell

Reasons for doing this:

(1) Bug 1501316 becomes easier to fix.

(2) JSOP_TABLESWITCH is no longer a variable-length bytecode op so we can get
    rid of js::GetVariableBytecodeLength.

Depends on D11018

Differential Revision: https://phabricator.services.mozilla.com/D11019

--HG--
extra : moz-landing-system : lando
---
 js/src/frontend/BytecodeEmitter.cpp | 27 ++++++++++++++++---
 js/src/frontend/BytecodeEmitter.h   |  4 ++-
 js/src/frontend/SwitchEmitter.cpp   | 24 +++++++++++------
 js/src/jit/BaselineCompiler.cpp     |  2 +-
 js/src/jit/BaselineIC.cpp           |  3 +--
 js/src/jit/BaselineIC.h             |  5 ++--
 js/src/jit/BytecodeAnalysis.cpp     |  7 ++---
 js/src/jit/IonControlFlow.cpp       |  4 +--
 js/src/js.msg                       |  2 +-
 js/src/vm/BytecodeLocation.h        | 10 -------
 js/src/vm/BytecodeUtil.cpp          | 42 ++++++++---------------------
 js/src/vm/BytecodeUtil.h            | 17 +++---------
 js/src/vm/CodeCoverage.cpp          |  9 +++----
 js/src/vm/Debugger.cpp              |  8 +++---
 js/src/vm/Interpreter.cpp           |  5 ++--
 js/src/vm/JSScript.cpp              |  2 +-
 js/src/vm/JSScript.h                | 10 +++++++
 js/src/vm/Opcodes.h                 |  9 +++----
 18 files changed, 94 insertions(+), 96 deletions(-)

diff --git a/js/src/frontend/BytecodeEmitter.cpp b/js/src/frontend/BytecodeEmitter.cpp
index 6d0113ed5173..7dc28b3daf04 100644
--- a/js/src/frontend/BytecodeEmitter.cpp
+++ b/js/src/frontend/BytecodeEmitter.cpp
@@ -2190,7 +2190,7 @@ BytecodeEmitter::isRunOnceLambda()
 }
 
 bool
-BytecodeEmitter::allocateResumeIndexForCurrentOffset(uint32_t* resumeIndex)
+BytecodeEmitter::allocateResumeIndex(ptrdiff_t offset, uint32_t* resumeIndex)
 {
     static constexpr uint32_t MaxResumeIndex = JS_BITMASK(24);
 
@@ -2203,7 +2203,26 @@ BytecodeEmitter::allocateResumeIndexForCurrentOffset(uint32_t* resumeIndex)
         return false;
     }
 
-    return resumeOffsetList.append(offset());
+    return resumeOffsetList.append(offset);
+}
+
+bool
+BytecodeEmitter::allocateResumeIndexRange(mozilla::Span<ptrdiff_t> offsets,
+                                          uint32_t* firstResumeIndex)
+{
+    *firstResumeIndex = 0;
+
+    for (size_t i = 0, len = offsets.size(); i < len; i++) {
+        uint32_t resumeIndex;
+        if (!allocateResumeIndex(offsets[i], &resumeIndex)) {
+            return false;
+        }
+        if (i == 0) {
+            *firstResumeIndex = resumeIndex;
+        }
+    }
+
+    return true;
 }
 
 bool
@@ -2225,7 +2244,7 @@ BytecodeEmitter::emitYieldOp(JSOp op)
     }
 
     uint32_t resumeIndex;
-    if (!allocateResumeIndexForCurrentOffset(&resumeIndex)) {
+    if (!allocateResumeIndex(offset(), &resumeIndex)) {
         return false;
     }
 
@@ -4458,7 +4477,7 @@ BytecodeEmitter::emitGoSub(JumpList* jump)
     }
 
     uint32_t resumeIndex;
-    if (!allocateResumeIndexForCurrentOffset(&resumeIndex)) {
+    if (!allocateResumeIndex(offset(), &resumeIndex)) {
         return false;
     }
 
diff --git a/js/src/frontend/BytecodeEmitter.h b/js/src/frontend/BytecodeEmitter.h
index 052f7c5d013f..0d449c067f95 100644
--- a/js/src/frontend/BytecodeEmitter.h
+++ b/js/src/frontend/BytecodeEmitter.h
@@ -617,7 +617,9 @@ struct MOZ_STACK_CLASS BytecodeEmitter
     }
     MOZ_MUST_USE bool emitGetDotGeneratorInScope(EmitterScope& currentScope);
 
-    MOZ_MUST_USE bool allocateResumeIndexForCurrentOffset(uint32_t* resumeIndex);
+    MOZ_MUST_USE bool allocateResumeIndex(ptrdiff_t offset, uint32_t* resumeIndex);
+    MOZ_MUST_USE bool allocateResumeIndexRange(mozilla::Span<ptrdiff_t> offsets,
+                                               uint32_t* firstResumeIndex);
 
     MOZ_MUST_USE bool emitInitialYield(UnaryNode* yieldNode);
     MOZ_MUST_USE bool emitYield(UnaryNode* yieldNode);
diff --git a/js/src/frontend/SwitchEmitter.cpp b/js/src/frontend/SwitchEmitter.cpp
index 71ed2779af62..23b3d6005762 100644
--- a/js/src/frontend/SwitchEmitter.cpp
+++ b/js/src/frontend/SwitchEmitter.cpp
@@ -6,6 +6,8 @@
 
 #include "frontend/SwitchEmitter.h"
 
+#include "mozilla/Span.h"
+
 #include "jsutil.h"
 
 #include "frontend/BytecodeEmitter.h"
@@ -202,9 +204,6 @@ SwitchEmitter::emitTable(const TableGenerator& tableGen)
     top_ = bce_->offset();
 
     // The note has one offset that tells total switch code length.
-
-    // 3 offsets (len, low, high) before the table, 1 per entry.
-    size_t switchSize = size_t(JUMP_OFFSET_LEN * (3 + tableGen.tableLength()));
     if (!bce_->newSrcNote2(SRC_TABLESWITCH, 0, &noteIndex_)) {
         return false;
     }
@@ -215,7 +214,7 @@ SwitchEmitter::emitTable(const TableGenerator& tableGen)
     }
 
     MOZ_ASSERT(top_ == bce_->offset());
-    if (!bce_->emitN(JSOP_TABLESWITCH, switchSize)) {
+    if (!bce_->emitN(JSOP_TABLESWITCH, JSOP_TABLESWITCH_LENGTH - sizeof(jsbytecode))) {
         return false;
     }
 
@@ -452,12 +451,21 @@ SwitchEmitter::emitEnd()
         // Skip over the already-initialized switch bounds.
         pc += 2 * JUMP_OFFSET_LEN;
 
-        // Fill in the jump table, if there is one.
+        // Use the 'default' offset for missing cases.
         for (uint32_t i = 0, length = caseOffsets_.length(); i < length; i++) {
-            ptrdiff_t off = caseOffsets_[i];
-            SET_JUMP_OFFSET(pc, (off != 0 ? off : defaultJumpTargetOffset_.offset) - top_);
-            pc += JUMP_OFFSET_LEN;
+            if (caseOffsets_[i] == 0) {
+                caseOffsets_[i] = defaultJumpTargetOffset_.offset;
+            }
         }
+
+        // Allocate resume index range.
+        uint32_t firstResumeIndex = 0;
+        mozilla::Span<ptrdiff_t> offsets = mozilla::MakeSpan(caseOffsets_.begin(),
+                                                             caseOffsets_.end());
+        if (!bce_->allocateResumeIndexRange(offsets, &firstResumeIndex)) {
+            return false;
+        }
+        SET_RESUMEINDEX(pc, firstResumeIndex);
     }
 
     // Patch breaks before leaving the scope, as all breaks are under the
diff --git a/js/src/jit/BaselineCompiler.cpp b/js/src/jit/BaselineCompiler.cpp
index fc51082ed7de..5a6078ff9598 100644
--- a/js/src/jit/BaselineCompiler.cpp
+++ b/js/src/jit/BaselineCompiler.cpp
@@ -4489,7 +4489,7 @@ BaselineCompiler::emit_JSOP_TABLESWITCH()
     frame.popRegsAndSync(1);
 
     // Call IC.
-    ICTableSwitch::Compiler compiler(cx, pc);
+    ICTableSwitch::Compiler compiler(cx, script, pc);
     return emitOpIC(compiler.getStub(&stubSpace_));
 }
 
diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp
index 3ce77a9b9613..277b95c48d63 100644
--- a/js/src/jit/BaselineIC.cpp
+++ b/js/src/jit/BaselineIC.cpp
@@ -5208,8 +5208,7 @@ ICTableSwitch::Compiler::getStub(ICStubSpace* space)
     jsbytecode* defaultpc = pc_ + GET_JUMP_OFFSET(pc_);
 
     for (int32_t i = 0; i < length; i++) {
-        table[i] = pc_ + GET_JUMP_OFFSET(pc);
-        pc += JUMP_OFFSET_LEN;
+        table[i] = script_->tableSwitchCasePC(pc_, i);
     }
 
     return newStub<ICTableSwitch>(space, code, table, low, length, defaultpc);
diff --git a/js/src/jit/BaselineIC.h b/js/src/jit/BaselineIC.h
index 5953fe5ae28a..e6f15622f58c 100644
--- a/js/src/jit/BaselineIC.h
+++ b/js/src/jit/BaselineIC.h
@@ -2637,11 +2637,12 @@ class ICTableSwitch : public ICStub
     class Compiler : public ICStubCompiler {
         MOZ_MUST_USE bool generateStubCode(MacroAssembler& masm) override;
 
+        JSScript* script_;
         jsbytecode* pc_;
 
       public:
-        Compiler(JSContext* cx, jsbytecode* pc)
-          : ICStubCompiler(cx, ICStub::TableSwitch), pc_(pc)
+        Compiler(JSContext* cx, JSScript* script, jsbytecode* pc)
+          : ICStubCompiler(cx, ICStub::TableSwitch), script_(script), pc_(pc)
         {}
 
         ICStub* getStub(ICStubSpace* space) override;
diff --git a/js/src/jit/BytecodeAnalysis.cpp b/js/src/jit/BytecodeAnalysis.cpp
index ec0a2680df57..544ba887b98e 100644
--- a/js/src/jit/BytecodeAnalysis.cpp
+++ b/js/src/jit/BytecodeAnalysis.cpp
@@ -105,13 +105,14 @@ BytecodeAnalysis::init(TempAllocator& alloc, GSNCache& gsn)
             infos_[defaultOffset].init(stackDepth);
             infos_[defaultOffset].jumpTarget = true;
 
-            for (int32_t i = low; i <= high; i++) {
-                unsigned targetOffset = offset + GET_JUMP_OFFSET(pc2);
+            uint32_t ncases = high - low + 1;
+
+            for (uint32_t i = 0; i < ncases; i++) {
+                unsigned targetOffset = script_->tableSwitchCaseOffset(pc, i);
                 if (targetOffset != defaultOffset) {
                     infos_[targetOffset].init(stackDepth);
                     infos_[targetOffset].jumpTarget = true;
                 }
-                pc2 += JUMP_OFFSET_LEN;
             }
             break;
           }
diff --git a/js/src/jit/IonControlFlow.cpp b/js/src/jit/IonControlFlow.cpp
index c9b904c50f2e..b75be861f5f8 100644
--- a/js/src/jit/IonControlFlow.cpp
+++ b/js/src/jit/IonControlFlow.cpp
@@ -1941,14 +1941,14 @@ ControlFlowGenerator::processTableSwitch(JSOp op, jssrcnote* sn)
     }
 
     // Create cases
-    jsbytecode* casepc = nullptr;
     for (int i = 0; i < high-low+1; i++) {
         if (!alloc().ensureBallast()) {
             return ControlStatus::Error;
         }
-        casepc = pc + GET_JUMP_OFFSET(pc2);
 
+        jsbytecode* casepc = script->tableSwitchCasePC(pc, i);
         MOZ_ASSERT(casepc >= pc && casepc <= exitpc);
+
         CFGBlock* caseBlock;
 
         if (casepc == defaultpc) {
diff --git a/js/src/js.msg b/js/src/js.msg
index 815cc2e6151c..7ab8ca5136e4 100644
--- a/js/src/js.msg
+++ b/js/src/js.msg
@@ -333,7 +333,7 @@ MSG_DEF(JSMSG_TOO_MANY_CON_ARGS,       0, JSEXN_SYNTAXERR, "too many constructor
 MSG_DEF(JSMSG_TOO_MANY_DEFAULTS,       0, JSEXN_SYNTAXERR, "more than one switch default")
 MSG_DEF(JSMSG_TOO_MANY_FUN_ARGS,       0, JSEXN_SYNTAXERR, "too many function arguments")
 MSG_DEF(JSMSG_TOO_MANY_LOCALS,         0, JSEXN_SYNTAXERR, "too many local variables")
-MSG_DEF(JSMSG_TOO_MANY_RESUME_INDEXES, 0, JSEXN_SYNTAXERR, "too many yield/await/finally locations")
+MSG_DEF(JSMSG_TOO_MANY_RESUME_INDEXES, 0, JSEXN_SYNTAXERR, "too many yield/await/finally/case locations")
 MSG_DEF(JSMSG_TOUGH_BREAK,             0, JSEXN_SYNTAXERR, "unlabeled break must be inside loop or switch")
 MSG_DEF(JSMSG_UNEXPECTED_TOKEN,        2, JSEXN_SYNTAXERR, "expected {0}, got {1}")
 MSG_DEF(JSMSG_UNEXPECTED_TOKEN_NO_EXPECT,  1, JSEXN_SYNTAXERR, "unexpected token: {0}")
diff --git a/js/src/vm/BytecodeLocation.h b/js/src/vm/BytecodeLocation.h
index 910af1bbe32c..93980c103514 100644
--- a/js/src/vm/BytecodeLocation.h
+++ b/js/src/vm/BytecodeLocation.h
@@ -154,16 +154,6 @@ class BytecodeLocation
         return GET_JUMP_OFFSET(rawBytecode_ + (2 * JUMP_OFFSET_LEN));
     }
 
-    // Return the BytecodeLocation referred to by index number in the table
-    // of the table switch.
-    BytecodeLocation getTableSwitchCaseByIndex(size_t index) const {
-        MOZ_ASSERT(is(JSOP_TABLESWITCH));
-        RawBytecode offsetLoc = rawBytecode_ +
-                                (3 *  JUMP_OFFSET_LEN) + // Skip over low and high
-                                (index * JUMP_OFFSET_LEN); // Select table entry
-        return BytecodeLocation(*this, rawBytecode_ + GET_JUMP_OFFSET(offsetLoc));
-    }
-
 #ifdef DEBUG
     // To ease writing assertions
     bool isValid() const {
diff --git a/js/src/vm/BytecodeUtil.cpp b/js/src/vm/BytecodeUtil.cpp
index f7497a5eff4f..ae9cc7cc0ba0 100644
--- a/js/src/vm/BytecodeUtil.cpp
+++ b/js/src/vm/BytecodeUtil.cpp
@@ -94,26 +94,6 @@ const char* const js::CodeName[] = {
 static bool
 DecompileArgumentFromStack(JSContext* cx, int formalIndex, UniqueChars* res);
 
-size_t
-js::GetVariableBytecodeLength(jsbytecode* pc)
-{
-    JSOp op = JSOp(*pc);
-    MOZ_ASSERT(CodeSpec[op].length == -1);
-    switch (op) {
-      case JSOP_TABLESWITCH: {
-        /* Structure: default-jump case-low case-high case1-jump ... */
-        pc += JUMP_OFFSET_LEN;
-        int32_t low = GET_JUMP_OFFSET(pc);
-        pc += JUMP_OFFSET_LEN;
-        int32_t high = GET_JUMP_OFFSET(pc);
-        unsigned ncases = unsigned(high - low + 1);
-        return 1 + 3 * JUMP_OFFSET_LEN + ncases * JUMP_OFFSET_LEN;
-      }
-      default:
-        MOZ_CRASH("Unexpected op");
-    }
-}
-
 /* static */ const char
 PCCounts::numExecName[] = "interp";
 
@@ -926,8 +906,10 @@ BytecodeParser::parse()
                 return false;
             }
 
-            for (int32_t i = low; i <= high; i++) {
-                uint32_t targetOffset = offset + GET_JUMP_OFFSET(pc2);
+            uint32_t ncases = high - low + 1;
+
+            for (uint32_t i = 0; i < ncases; i++) {
+                uint32_t targetOffset = script_->tableSwitchCaseOffset(pc, i);
                 if (targetOffset != defaultOffset) {
                     if (!addJump(targetOffset, &nextOffset, stackDepth, offsetStack,
                                  pc, JumpKind::SwitchCase))
@@ -935,7 +917,6 @@ BytecodeParser::parse()
                         return false;
                     }
                 }
-                pc2 += JUMP_OFFSET_LEN;
             }
             break;
           }
@@ -1433,7 +1414,7 @@ Disassemble1(JSContext* cx, HandleScript script, jsbytecode* pc,
         return 0;
     }
     const JSCodeSpec* cs = &CodeSpec[op];
-    ptrdiff_t len = (ptrdiff_t) cs->length;
+    const unsigned len = cs->length;
     if (!sp->jsprintf("%05u:", loc)) {
         return 0;
     }
@@ -1582,13 +1563,11 @@ Disassemble1(JSContext* cx, HandleScript script, jsbytecode* pc,
         }
 
         for (i = low; i <= high; i++) {
-            off = GET_JUMP_OFFSET(pc2);
+            off = script->tableSwitchCaseOffset(pc, i - low) - script->pcToOffset(pc);
             if (!sp->jsprintf("\n\t%d: %d", i, int(off))) {
                 return 0;
             }
-            pc2 += JUMP_OFFSET_LEN;
         }
-        len = 1 + pc2 - pc;
         break;
       }
 
@@ -3038,8 +3017,10 @@ js::GetCodeCoverageSummary(JSContext* cx, size_t* length)
 }
 
 bool
-js::GetSuccessorBytecodes(jsbytecode* pc, PcVector& successors)
+js::GetSuccessorBytecodes(JSScript* script, jsbytecode* pc, PcVector& successors)
 {
+    MOZ_ASSERT(script->containsPC(pc));
+
     JSOp op = (JSOp)*pc;
     if (FlowsIntoNext(op)) {
         if (!successors.append(GetNextPc(pc))) {
@@ -3063,10 +3044,9 @@ js::GetSuccessorBytecodes(jsbytecode* pc, PcVector& successors)
         npc += JUMP_OFFSET_LEN;
 
         for (int i = 0; i < ncases; i++) {
-            if (!successors.append(pc + GET_JUMP_OFFSET(npc))) {
+            if (!successors.append(script->tableSwitchCasePC(pc, i))) {
                 return false;
             }
-            npc += JUMP_OFFSET_LEN;
         }
     }
 
@@ -3080,7 +3060,7 @@ js::GetPredecessorBytecodes(JSScript* script, jsbytecode* pc, PcVector& predeces
     MOZ_ASSERT(pc >= script->code() && pc < end);
     for (jsbytecode* npc = script->code(); npc < end; npc = GetNextPc(npc)) {
         PcVector successors;
-        if (!GetSuccessorBytecodes(npc, successors)) {
+        if (!GetSuccessorBytecodes(script, npc, successors)) {
             return false;
         }
         for (size_t i = 0; i < successors.length(); i++) {
diff --git a/js/src/vm/BytecodeUtil.h b/js/src/vm/BytecodeUtil.h
index a51d0f7fd113..243643f8e340 100644
--- a/js/src/vm/BytecodeUtil.h
+++ b/js/src/vm/BytecodeUtil.h
@@ -384,7 +384,7 @@ static const unsigned ENVCOORD_SLOT_BITS  = 24;
 static const uint32_t ENVCOORD_SLOT_LIMIT = 1 << ENVCOORD_SLOT_BITS;
 
 struct JSCodeSpec {
-    int8_t              length;         /* length including opcode byte */
+    uint8_t             length;         /* length including opcode byte */
     int8_t              nuses;          /* arity, -1 if variadic */
     int8_t              ndefs;          /* number of stack results */
     uint32_t            format;         /* immediate operand format */
@@ -503,12 +503,6 @@ ReconstructStackDepth(JSContext* cx, JSScript* script, jsbytecode* pc, uint32_t*
 
 namespace js {
 
-/*
- * Get the length of variable-length bytecode like JSOP_TABLESWITCH.
- */
-extern size_t
-GetVariableBytecodeLength(jsbytecode* pc);
-
 /*
  * Find the source expression that resulted in v, and return a newly allocated
  * C-string containing it.  Fall back on v's string conversion (fallback) if we
@@ -542,11 +536,8 @@ GetBytecodeLength(jsbytecode* pc)
 {
     JSOp op = (JSOp)*pc;
     MOZ_ASSERT(op < JSOP_LIMIT);
-
-    if (CodeSpec[op].length != -1) {
-        return CodeSpec[op].length;
-    }
-    return GetVariableBytecodeLength(pc);
+    MOZ_ASSERT(CodeSpec[op].length > 0);
+    return CodeSpec[op].length;
 }
 
 static inline bool
@@ -836,7 +827,7 @@ GetNextPc(jsbytecode* pc)
 
 typedef Vector<jsbytecode*, 4, SystemAllocPolicy> PcVector;
 
-bool GetSuccessorBytecodes(jsbytecode* pc, PcVector& successors);
+bool GetSuccessorBytecodes(JSScript* script, jsbytecode* pc, PcVector& successors);
 bool GetPredecessorBytecodes(JSScript* script, jsbytecode* pc, PcVector& predecessors);
 
 #if defined(DEBUG) || defined(JS_JITSPEW)
diff --git a/js/src/vm/CodeCoverage.cpp b/js/src/vm/CodeCoverage.cpp
index 9c15c0438c2c..04643351b828 100644
--- a/js/src/vm/CodeCoverage.cpp
+++ b/js/src/vm/CodeCoverage.cpp
@@ -304,11 +304,10 @@ LCovSource::writeScript(JSScript* script)
             int32_t high = GET_JUMP_OFFSET(pc + JUMP_OFFSET_LEN * 2);
             MOZ_ASSERT(high - low + 1 >= 0);
             size_t numCases = high - low + 1;
-            jsbytecode* jumpTable = pc + JUMP_OFFSET_LEN * 3;
 
             jsbytecode* firstcasepc = exitpc;
             for (size_t j = 0; j < numCases; j++) {
-                jsbytecode* testpc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * j);
+                jsbytecode* testpc = script->tableSwitchCasePC(pc, j);
                 MOZ_ASSERT(script->code() <= testpc && testpc < end);
                 if (testpc < firstcasepc) {
                     firstcasepc = testpc;
@@ -326,7 +325,7 @@ LCovSource::writeScript(JSScript* script)
             size_t caseId = 0;
             bool tableJumpsToDefault = false;
             for (size_t i = 0; i < numCases; i++) {
-                jsbytecode* casepc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * i);
+                jsbytecode* casepc = script->tableSwitchCasePC(pc, i);
                 MOZ_ASSERT(script->code() <= casepc && casepc < end);
                 if (casepc == defaultpc) {
                     tableJumpsToDefault = true;
@@ -336,7 +335,7 @@ LCovSource::writeScript(JSScript* script)
                 jsbytecode* lastcasepc = firstcasepc - 1;
                 bool foundLastCase = false;
                 for (size_t j = 0; j < numCases; j++) {
-                    jsbytecode* testpc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * j);
+                    jsbytecode* testpc = script->tableSwitchCasePC(pc, j);
                     MOZ_ASSERT(script->code() <= testpc && testpc < end);
                     if (lastcasepc < testpc && (testpc < casepc || (j < i && testpc == casepc))) {
                         lastcasepc = testpc;
@@ -404,7 +403,7 @@ LCovSource::writeScript(JSScript* script)
                 jsbytecode* lastcasepc = firstcasepc - 1;
                 bool foundLastCase = false;
                 for (size_t j = 0; j < numCases; j++) {
-                    jsbytecode* testpc = pc + GET_JUMP_OFFSET(jumpTable + JUMP_OFFSET_LEN * j);
+                    jsbytecode* testpc = script->tableSwitchCasePC(pc, j);
                     MOZ_ASSERT(script->code() <= testpc && testpc < end);
                     if (lastcasepc < testpc && testpc < defaultpc) {
                         lastcasepc = testpc;
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index 2e5d7c358923..ade5bb03258c 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -6600,7 +6600,8 @@ class FlowGraphSummary {
             if (CodeSpec[op].type() == JOF_JUMP) {
                 addEdge(lineno, column, r.frontOffset() + GET_JUMP_OFFSET(r.frontPC()));
             } else if (op == JSOP_TABLESWITCH) {
-                jsbytecode* pc = r.frontPC();
+                jsbytecode* const switchPC = r.frontPC();
+                jsbytecode* pc = switchPC;
                 size_t offset = r.frontOffset();
                 ptrdiff_t step = JUMP_OFFSET_LEN;
                 size_t defaultOffset = offset + GET_JUMP_OFFSET(pc);
@@ -6613,9 +6614,8 @@ class FlowGraphSummary {
                 pc += JUMP_OFFSET_LEN;
 
                 for (int i = 0; i < ncases; i++) {
-                    size_t target = offset + GET_JUMP_OFFSET(pc);
+                    size_t target = script->tableSwitchCaseOffset(switchPC, i);
                     addEdge(lineno, column, target);
-                    pc += step;
                 }
             } else if (op == JSOP_TRY) {
                 // As there is no literal incoming edge into the catch block, we
@@ -6826,7 +6826,7 @@ class DebuggerScriptGetSuccessorOrPredecessorOffsetsMatcher
 
         PcVector adjacent;
         if (successor_) {
-            if (!GetSuccessorBytecodes(script->code() + offset_, adjacent)) {
+            if (!GetSuccessorBytecodes(script, script->code() + offset_, adjacent)) {
                 ReportOutOfMemory(cx_);
                 return false;
             }
diff --git a/js/src/vm/Interpreter.cpp b/js/src/vm/Interpreter.cpp
index d08b50d1915d..53199863b6d2 100644
--- a/js/src/vm/Interpreter.cpp
+++ b/js/src/vm/Interpreter.cpp
@@ -3778,9 +3778,8 @@ CASE(JSOP_TABLESWITCH)
     int32_t high = GET_JUMP_OFFSET(pc2);
 
     i = uint32_t(i) - uint32_t(low);
-    if ((uint32_t)i < (uint32_t)(high - low + 1)) {
-        pc2 += JUMP_OFFSET_LEN + JUMP_OFFSET_LEN * i;
-        len = GET_JUMP_OFFSET(pc2);
+    if (uint32_t(i) < uint32_t(high - low + 1)) {
+        len = script->tableSwitchCaseOffset(REGS.pc, uint32_t(i)) - script->pcToOffset(REGS.pc);
     }
     ADVANCE_AND_DISPATCH(len);
 }
diff --git a/js/src/vm/JSScript.cpp b/js/src/vm/JSScript.cpp
index 26da312d0c19..223fc0d9ebb3 100644
--- a/js/src/vm/JSScript.cpp
+++ b/js/src/vm/JSScript.cpp
@@ -3626,7 +3626,7 @@ JSScript::assertValidJumpTargets() const
             int32_t high = loc.getTableSwitchHigh();
 
             for (int i = 0; i < high - low + 1; i++) {
-                BytecodeLocation switchCase = loc.getTableSwitchCaseByIndex(i);
+                BytecodeLocation switchCase(this, tableSwitchCasePC(loc.toRawBytecode(), i));
                 MOZ_ASSERT(mainLoc <= switchCase && switchCase < endLoc);
                 MOZ_ASSERT(switchCase.isJumpTarget());
             }
diff --git a/js/src/vm/JSScript.h b/js/src/vm/JSScript.h
index 4cbb01d6b2ed..90357547b0e7 100644
--- a/js/src/vm/JSScript.h
+++ b/js/src/vm/JSScript.h
@@ -2565,6 +2565,16 @@ class JSScript : public js::gc::TenuredCell
         return data_->resumeOffsets();
     }
 
+    uint32_t tableSwitchCaseOffset(jsbytecode* pc, uint32_t caseIndex) const {
+        MOZ_ASSERT(containsPC(pc));
+        MOZ_ASSERT(*pc == JSOP_TABLESWITCH);
+        uint32_t firstResumeIndex = GET_RESUMEINDEX(pc + 3 * JUMP_OFFSET_LEN);
+        return resumeOffsets()[firstResumeIndex + caseIndex];
+    }
+    jsbytecode* tableSwitchCasePC(jsbytecode* pc, uint32_t caseIndex) const {
+        return offsetToPC(tableSwitchCaseOffset(pc, caseIndex));
+    }
+
     bool hasLoops();
 
     uint32_t numNotes() const {
diff --git a/js/src/vm/Opcodes.h b/js/src/vm/Opcodes.h
index f9c14b830c03..abd3d19f50f2 100644
--- a/js/src/vm/Opcodes.h
+++ b/js/src/vm/Opcodes.h
@@ -694,19 +694,18 @@
     macro(JSOP_AND, 69, "and", NULL, 5, 1, 1, JOF_JUMP|JOF_DETECTING|JOF_IC) \
     /*
      * Pops the top of stack value as 'i', if 'low <= i <= high',
-     * jumps to a 32-bit offset: 'offset[i - low]' from the current bytecode
+     * jumps to a 32-bit offset: offset is stored in the script's resumeOffsets
+     *                           list at index 'firstResumeIndex + (i - low)'
      * jumps to a 32-bit offset: 'len' from the current bytecode otherwise
      *
-     * This opcode has variable length.
-     *
      *   Category: Statements
      *   Type: Switch Statement
      *   Operands: int32_t len, int32_t low, int32_t high,
-     *             int32_t offset[0], ..., int32_t offset[high-low]
+     *             uint24_t firstResumeIndex
      *   Stack: i =>
      *   len: len
      */ \
-    macro(JSOP_TABLESWITCH, 70, "tableswitch", NULL, -1, 1, 0, JOF_TABLESWITCH|JOF_DETECTING|JOF_IC) \
+    macro(JSOP_TABLESWITCH, 70, "tableswitch", NULL, 16, 1, 0, JOF_TABLESWITCH|JOF_DETECTING|JOF_IC) \
     /*
      * Prologue emitted in scripts expected to run once, which deoptimizes code
      * if it executes multiple times.

From 0ea5080e8532a6c9f748201ff4d81d58f0f21d8d Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 8 Nov 2018 17:02:27 +0000
Subject: [PATCH 16/77] Bug 1505072 - Implement rusttests as a non-default
 sub-graph of the build. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D11240

--HG--
extra : moz-landing-system : lando
---
 python/mozbuild/mozbuild/backend/recursivemake.py | 7 ++++++-
 python/mozbuild/mozbuild/frontend/data.py         | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py
index 560a933cb317..6d96aaec5277 100644
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@@ -1187,6 +1187,10 @@ class RecursiveMakeBackend(CommonBackend):
 
     def _process_rust_tests(self, obj, backend_file):
         self._no_skip['check'].add(backend_file.relobjdir)
+        build_target = self._build_target_for_obj(obj)
+        self._compile_graph[build_target]
+        self._process_non_default_target(obj, 'force-cargo-test-run',
+                                         backend_file)
         backend_file.write_once('CARGO_FILE := $(srcdir)/Cargo.toml\n')
         backend_file.write_once('RUST_TESTS := %s\n' % ' '.join(obj.names))
         backend_file.write_once('RUST_TEST_FEATURES := %s\n' % ' '.join(obj.features))
@@ -1344,9 +1348,10 @@ class RecursiveMakeBackend(CommonBackend):
         backend_file.write('HOST_SHARED_LIBRARY = %s\n' % libdef.lib_name)
 
     def _build_target_for_obj(self, obj):
-        target_name = obj.KIND
         if hasattr(obj, 'output_category') and obj.output_category:
             target_name = obj.output_category
+        else:
+            target_name = obj.KIND
         return '%s/%s' % (mozpath.relpath(obj.objdir,
             self.environment.topobjdir), target_name)
 
diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py
index 3af850edd28e..bc38089e16c2 100644
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@@ -602,12 +602,14 @@ class RustTests(ContextDerived):
     __slots__ = (
         'names',
         'features',
+        'output_category',
     )
 
     def __init__(self, context, names, features):
         ContextDerived.__init__(self, context)
         self.names = names
         self.features = features
+        self.output_category = 'rusttests'
 
 
 class BaseLibrary(Linkable):

From 45c16653f9155be2c37806319dc97595b43956df Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 8 Nov 2018 17:03:11 +0000
Subject: [PATCH 17/77] Bug 1505072 - Allow mozharness build jobs to specify
 non-default build targets. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D11241

--HG--
extra : moz-landing-system : lando
---
 .../mozharness/mozilla/building/buildbase.py       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py
index 935dd13d5668..8431d65f0b93 100755
--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -1088,10 +1088,18 @@ or run without that action (ie: --no-{action})"
     def build(self):
         """builds application."""
 
-        # This will error on non-0 exit code.
-        self._run_mach_command_in_build_env(['build', '-v'])
+        args = ['build', '-v']
+
+        custom_build_targets = self.config.get('build_targets')
+        if custom_build_targets:
+            args += custom_build_targets
+
+        # This will error on non-0 exit code.
+        self._run_mach_command_in_build_env(args)
+
+        if not custom_build_targets:
+            self.generate_build_props(console_output=True, halt_on_failure=True)
 
-        self.generate_build_props(console_output=True, halt_on_failure=True)
         self._generate_build_stats()
 
     def static_analysis_autotest(self):

From 0160b3540d17bb6792b0eeb1e49b531924c66029 Mon Sep 17 00:00:00 2001
From: Chris Manchester <cmanchester@mozilla.com>
Date: Thu, 8 Nov 2018 18:38:26 +0000
Subject: [PATCH 18/77] Bug 1505072 - Automation and mozconfig changes to
 convert rusttests builds to use non-default build target. r=froydnj

Two mozconfg additions are necessary for these jobs on linux:
1.) Turning off the clang plugin, which will not get built during these builds
and will cause failures when C/C++ needed by the rust build tries to find it.
2.) Adding --output-sync=line to our make invocation: at some point the
"export" phase started relying on this, and it's missing because the
non-default build targets invoked by the rusttests builds don't go through
client.mk.

Differential Revision: https://phabricator.services.mozilla.com/D11242

--HG--
extra : moz-landing-system : lando
---
 browser/config/mozconfigs/linux32/rusttests               | 3 +++
 browser/config/mozconfigs/linux32/rusttests-debug         | 3 +++
 browser/config/mozconfigs/linux64/rusttests               | 3 +++
 browser/config/mozconfigs/linux64/rusttests-debug         | 3 +++
 taskcluster/ci/build/linux.yml                            | 8 ++++----
 taskcluster/ci/build/windows.yml                          | 6 ++++++
 .../builds/releng_sub_linux_configs/32_rusttests.py       | 2 ++
 .../builds/releng_sub_linux_configs/32_rusttests_debug.py | 2 ++
 .../builds/releng_sub_linux_configs/64_rusttests.py       | 2 ++
 .../builds/releng_sub_linux_configs/64_rusttests_debug.py | 2 ++
 .../configs/builds/taskcluster_sub_win64/rusttests_opt.py | 5 +++++
 11 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/browser/config/mozconfigs/linux32/rusttests b/browser/config/mozconfigs/linux32/rusttests
index 832caeadd91b..f49d34228eec 100644
--- a/browser/config/mozconfigs/linux32/rusttests
+++ b/browser/config/mozconfigs/linux32/rusttests
@@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-rust-tests
+mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
 
 . "$topsrcdir/browser/config/mozconfigs/linux32/nightly"
+
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/linux32/rusttests-debug b/browser/config/mozconfigs/linux32/rusttests-debug
index 21f43445a9a8..72f408130ae1 100644
--- a/browser/config/mozconfigs/linux32/rusttests-debug
+++ b/browser/config/mozconfigs/linux32/rusttests-debug
@@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-rust-tests
+mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
 
 . "$topsrcdir/browser/config/mozconfigs/linux32/debug"
+
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/linux64/rusttests b/browser/config/mozconfigs/linux64/rusttests
index 464161c17d94..a5b3cf3cdb47 100644
--- a/browser/config/mozconfigs/linux64/rusttests
+++ b/browser/config/mozconfigs/linux64/rusttests
@@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-rust-tests
+mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
+
+unset ENABLE_CLANG_PLUGIN
diff --git a/browser/config/mozconfigs/linux64/rusttests-debug b/browser/config/mozconfigs/linux64/rusttests-debug
index 8ffcee0082b5..78f00096d227 100644
--- a/browser/config/mozconfigs/linux64/rusttests-debug
+++ b/browser/config/mozconfigs/linux64/rusttests-debug
@@ -3,5 +3,8 @@ MOZ_AUTOMATION_PACKAGE_TESTS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 ac_add_options --enable-rust-tests
+mk_add_options MOZ_MAKE_FLAGS=--output-sync=line
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/debug"
+
+unset ENABLE_CLANG_PLUGIN
diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index c19410347f78..a90b49401ca8 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -424,7 +424,7 @@ linux-rusttests/opt:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
-        actions: [get-secrets, build, check-test]
+        actions: [get-secrets, build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_32_builds.py
@@ -461,7 +461,7 @@ linux-rusttests/debug:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
-        actions: [get-secrets, build, check-test]
+        actions: [get-secrets, build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_32_builds.py
@@ -858,7 +858,7 @@ linux64-rusttests/opt:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
-        actions: [get-secrets, build, check-test]
+        actions: [get-secrets, build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
@@ -894,7 +894,7 @@ linux64-rusttests/debug:
             PERFHERDER_EXTRA_OPTIONS: rusttests
     run:
         using: mozharness
-        actions: [get-secrets, build, check-test]
+        actions: [get-secrets, build]
         config:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index f38ddadc4746..c2832c161aa7 100755
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -509,6 +509,7 @@ win32-rusttests/opt:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
+        actions: [build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
@@ -518,6 +519,8 @@ win32-rusttests/opt:
         extra-config:
             stage_platform: win32-rusttests
             artifact_flag_build_variant_in_try: null
+            build_targets: ['pre-export', 'export', 'recurse_rusttests']
+            disable_package_metrics: true
         mozconfig-variant: rusttests
     run-on-projects: ['trunk', 'try']
     toolchains:
@@ -544,6 +547,7 @@ win32-rusttests/debug:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
     run:
         using: mozharness
+        actions: [build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
@@ -553,6 +557,8 @@ win32-rusttests/debug:
         extra-config:
             stage_platform: win32-rusttests
             artifact_flag_build_variant_in_try: null
+            build_targets: ['pre-export', 'export', 'recurse_rusttests']
+            disable_package_metrics: true
         mozconfig-variant: rusttests-debug
     run-on-projects: ['trunk', 'try']
     toolchains:
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
index 1d3a64fcf5bd..92018b8f7c25 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests.py
@@ -17,7 +17,9 @@ config = {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
+    'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'mozconfig_variant': 'rusttests',
     'artifact_flag_build_variant_in_try': None,
+    'disable_package_metrics': True,
     #######################
 }
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
index a75b1d8eca72..2d76ae16226c 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/32_rusttests_debug.py
@@ -18,6 +18,8 @@ config = {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
         'TINDERBOX_OUTPUT': '1',
     },
+    'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'artifact_flag_build_variant_in_try': None,
+    'disable_package_metrics': True,
     #######################
 }
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
index 970396310aee..72d5347212b2 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests.py
@@ -17,6 +17,8 @@ config = {
         'PATH': ':/usr/local/bin:/bin:\
 /usr/bin:/usr/local/sbin:/usr/sbin:/sbin',
     },
+    'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'artifact_flag_build_variant_in_try': None,
+    'disable_package_metrics': True,
     #######################
 }
diff --git a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
index 10946afed9da..cbc932268bd6 100644
--- a/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_linux_configs/64_rusttests_debug.py
@@ -17,5 +17,7 @@ config = {
         'LD_LIBRARY_PATH': '%(abs_obj_dir)s/dist/bin',
         'TINDERBOX_OUTPUT': '1',
     },
+    'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
     'artifact_flag_build_variant_in_try': None,
+    'disable_package_metrics': True,
 }
diff --git a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
index 59944d8ee5c9..2a680044e011 100644
--- a/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
+++ b/testing/mozharness/configs/builds/taskcluster_sub_win64/rusttests_opt.py
@@ -1,7 +1,12 @@
 config = {
+    'default_actions': [
+        'build',
+    ],
     'stage_platform': 'win64-rusttests',
     'env': {
         'XPCOM_DEBUG_BREAK': 'stack-and-abort',
     },
+    'build_targets': ['pre-export', 'export', 'recurse_rusttests'],
+    'disable_package_metrics': True,
     'artifact_flag_build_variant_in_try': None,
 }

From c887792c0901101510737361515f5fb28f9b2f54 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 8 Nov 2018 18:43:02 +0000
Subject: [PATCH 19/77] Bug 1505328 - Remove the theme transition from the
 title bar. r=dao

Differential Revision: https://phabricator.services.mozilla.com/D11282

--HG--
extra : moz-landing-system : lando
---
 browser/themes/shared/browser.inc.css         |  4 ----
 .../browser_ext_themes_alpha_accentcolor.js   |  9 ++------
 .../browser_ext_themes_chromeparity.js        | 15 +++----------
 .../browser_ext_themes_dynamic_updates.js     | 12 ++--------
 .../browser/browser_ext_themes_lwtsupport.js  |  4 +---
 .../browser_ext_themes_sanitization.js        | 22 ++-----------------
 .../browser_ext_themes_theme_transition.js    | 15 +------------
 7 files changed, 11 insertions(+), 70 deletions(-)

diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index f4e954e644a0..12f4d01b3d82 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -19,10 +19,6 @@
   --space-above-tabbar: 8px;
 }
 
-:root[sessionrestored]:-moz-lwtheme {
-  transition: @themeTransition@;
-}
-
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
index 2fe5bd95a8fd..8a48e44cbf14 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
@@ -18,15 +18,10 @@ add_task(async function test_alpha_accentcolor() {
     },
   });
 
-  // Add the event listener before loading the extension
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
-
   await extension.startup();
 
-  // wait for theme transition to end
-  await transitionPromise;
-
+  // Add the event listener before loading the extension
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(230, 128, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
index 1866ccb34afe..3afef7b4bd7c 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
@@ -20,11 +20,9 @@ add_task(async function test_support_theme_frame() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
   Assert.equal(docEl.getAttribute("lwthemetextcolor"), "bright",
                "LWT text color attribute should be set");
@@ -64,21 +62,16 @@ add_task(async function test_support_theme_frame_inactive() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
                "Window background is set to the colors.frame property");
 
   // Now we'll open a new window to see if the inactive browser accent color changed
-  transitionPromise = waitForTransition(docEl, "background-color");
   let window2 = await BrowserTestUtils.openNewBrowserWindow();
-  await transitionPromise;
-
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR_INACTIVE.join(", ") + ")",
                `Inactive window background color should be ${FRAME_COLOR_INACTIVE}`);
 
@@ -108,11 +101,9 @@ add_task(async function test_lack_of_theme_frame_inactive() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
index 70b512cf4f8c..d0038f950ab1 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
@@ -63,8 +63,6 @@ add_task(async function test_dynamic_theme_updates() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image1.png",
@@ -76,11 +74,9 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme("image1.png", ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
-  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image2.png",
@@ -92,7 +88,6 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme("image2.png", ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -105,6 +100,7 @@ add_task(async function test_dynamic_theme_updates() {
 
   await extension.unload();
 
+  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
 
@@ -131,8 +127,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_1,
@@ -144,11 +138,9 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme(BACKGROUND_1, ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
-  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_2,
@@ -160,7 +152,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme(BACKGROUND_2, ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -173,5 +164,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
 
   await extension.unload();
 
+  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
index 60d579ddd020..5776cf3b30e9 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
@@ -18,11 +18,9 @@ add_task(async function test_support_LWT_properties() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
index b59eddc8fd63..b664c06ba65e 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
@@ -16,11 +16,7 @@ add_task(async function test_sanitization_invalid() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -46,11 +42,7 @@ add_task(async function test_sanitization_css_variables() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -76,11 +68,7 @@ add_task(async function test_sanitization_transparent() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.ok(
@@ -104,12 +92,9 @@ add_task(async function test_sanitization_transparent_accentcolor() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = document.documentElement;
   Assert.equal(
     window.getComputedStyle(docEl).backgroundColor,
     "rgb(255, 255, 255)",
@@ -132,12 +117,9 @@ add_task(async function test_sanitization_transparent_textcolor() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = document.documentElement;
   Assert.equal(
     window.getComputedStyle(docEl).color,
     "rgb(0, 0, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
index 804fa1e65006..92f1df6ab4ab 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
@@ -4,7 +4,6 @@
 // correctly.
 
 add_task(async function test_theme_transition_effects() {
-  const ACCENT_COLOR = "#aaf442";
   const TOOLBAR = "#f27489";
   const TEXT_COLOR = "#000000";
   const TRANSITION_PROPERTY = "background-color";
@@ -13,7 +12,6 @@ add_task(async function test_theme_transition_effects() {
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
           "textcolor": TEXT_COLOR,
           "toolbar": TOOLBAR,
           "toolbar_text": TEXT_COLOR,
@@ -24,18 +22,7 @@ add_task(async function test_theme_transition_effects() {
 
   await extension.startup();
 
-  // check if transition effect is set for root, which affects transition for
-  // accent color
-  let docEl = window.document.documentElement;
-  let rootCS = window.getComputedStyle(docEl);
-
-  Assert.equal(
-    rootCS.getPropertyValue("transition-property"),
-    TRANSITION_PROPERTY,
-    "Transition property set for root"
-  );
-
-  // now check transition effect for toolbars
+  // check transition effect for toolbars
   let navbar = document.querySelector("#nav-bar");
   let navbarCS = window.getComputedStyle(navbar);
 

From 86ce20e46a471665b49f30b8c8c204cd6f82c930 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Thu, 8 Nov 2018 21:47:38 +0200
Subject: [PATCH 20/77] Backed out changeset 5cb52fcd2fb0 (bug 1504751) for
 browser_misused_characters_in_strings.js failures. CLOSED TREE

---
 .../bug_1504751_aboutnetworking.py            |  89 -----------
 toolkit/content/aboutNetworking.xhtml         | 140 +++++++++---------
 .../en-US/chrome/global/aboutNetworking.dtd   |  59 ++++++++
 .../en-US/toolkit/about/aboutNetworking.ftl   |  61 --------
 toolkit/locales/jar.mn                        |   1 +
 5 files changed, 133 insertions(+), 217 deletions(-)
 delete mode 100644 python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
 create mode 100644 toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
 delete mode 100644 toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl

diff --git a/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py b/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
deleted file mode 100644
index 6e56a0687031..000000000000
--- a/python/l10n/fluent_migrations/bug_1504751_aboutnetworking.py
+++ /dev/null
@@ -1,89 +0,0 @@
-from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate.helpers import transforms_from
-from fluent.migrate import REPLACE
-from fluent.migrate import COPY
-
-
-def migrate(ctx):
-    """ Bug 1504751 - Migrate about:Networking to Fluent, part {index}. """
-
-    ctx.add_transforms(
-        "toolkit/toolkit/about/aboutNetworking.ftl",
-        "toolkit/toolkit/about/aboutNetworking.ftl",
-        transforms_from(
-"""
-title = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.title")}
-warning = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.warning")}
-show-next-time-checkbox = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.showNextTime")}
-ok = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.ok")}
-http = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.HTTP")}
-sockets = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.sockets")}
-dns = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dns")}
-websockets = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.websockets")}
-refresh = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.refresh")}
-auto-refresh = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.autoRefresh")}
-hostname = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.hostname")}
-port = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.port")}
-http2 = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.http2")}
-ssl = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.ssl")}
-active = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.active")}
-idle = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.idle")}
-host = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.host")}
-tcp = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.tcp")}
-sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.sent")}
-received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.received")}
-family = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.family")}
-trr = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.trr")}
-addresses = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.addresses")}
-expires = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.expires")}
-messages-sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.messagesSent")}
-messages-received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.messagesReceived")}
-bytes-sent = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.bytesSent")}
-bytes-received = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.bytesReceived")}
-logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.logging")}
-current-log-file = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.currentLogFile")}
-current-log-modules = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.currentLogModules")}
-set-log-file = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.setLogFile")}
-set-log-modules = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.setLogModules")}
-start-logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.startLogging")}
-stop-logging = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.stopLogging")}
-dns-lookup = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookup")}
-dns-lookup-button = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookupButton")}
-dns-domain = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsDomain")}
-dns-lookup-table-column = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.dnsLookupTableColumn")}
-rcwn = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwn")}
-rcwn-status = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnStatus")}
-rcwn-cache-won-count = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheWonCount")}
-rcwn-net-won-count = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnNetWonCount")}
-total-network-requests = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.totalNetworkRequests")}
-rcwn-operation = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnOperation")}
-rcwn-perf-open = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfOpen")}
-rcwn-perf-read = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfRead")}
-rcwn-perf-write = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfWrite")}
-rcwn-perf-entry-open = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnPerfEntryOpen")}
-rcwn-avg-short = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnAvgShort")}
-rcwn-avg-long = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnAvgLong")}
-rcwn-std-dev-long = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnStddevLong")}
-rcwn-cache-slow = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheSlow")}
-rcwn-cache-not-slow = { COPY("toolkit/chrome/global/aboutNetworking.dtd", "aboutNetworking.rcwnCacheNotSlow")}
-"""
-        )
-    )
-
-    ctx.add_transforms(
-        "toolkit/toolkit/about/aboutNetworking.ftl",
-        "toolkit/toolkit/about/aboutNetworking.ftl",
-        [
-            FTL.Message(
-            id=FTL.Identifier("log-tutorial"),
-            value=REPLACE(
-                "toolkit/chrome/global/aboutNetworking.dtd",
-                "aboutNetworking.logTutorial",
-                {
-                    "href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging'": FTL.TextElement('data-l10n-name="logging"')
-                }
-            )
-        )
-    ]
-)
diff --git a/toolkit/content/aboutNetworking.xhtml b/toolkit/content/aboutNetworking.xhtml
index e8aa321fb3e2..4f756bc06b1d 100644
--- a/toolkit/content/aboutNetworking.xhtml
+++ b/toolkit/content/aboutNetworking.xhtml
@@ -4,59 +4,65 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 
-<!DOCTYPE html>
+<!DOCTYPE html [
+<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
+<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd"> %brandDTD;
+<!ENTITY % networkingDTD SYSTEM "chrome://global/locale/aboutNetworking.dtd"> %networkingDTD;
+]>
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="&locale.dir;">
     <head>
-        <title data-l10n-id="title"/>
+        <title>&aboutNetworking.title;</title>
         <link rel="stylesheet" href="chrome://mozapps/skin/aboutNetworking.css" type="text/css" />
         <script type="application/javascript" src="chrome://global/content/aboutNetworking.js" />
-        <link rel="localization"  href="toolkit/about/aboutNetworking.ftl"/>
     </head>
     <body id="body">
         <div id="warning_message" class="warningBackground" hidden="true">
             <div class="container">
-                <h1 class="title" data-l10n-id="warning"/>
+                <h1 class="title">&aboutNetworking.warning;</h1>
                 <div class="toggle-container-with-text">
                     <input id="warncheck" type="checkbox" checked="yes" role="checkbox" />
-                    <label for="warncheck" data-l10n-id="show-next-time-checkbox"/>
+                    <label for="warncheck">&aboutNetworking.showNextTime;</label>
                 </div>
                 <div>
-                    <button id="confpref" class="primary" data-l10n-id="ok"/>
+                    <button id="confpref" class="primary">&aboutNetworking.ok;</button>
                 </div>
             </div>
         </div>
         <div id="categories">
             <div class="category" selected="true" id="category-http">
-                <span class="category-name" data-l10n-id="http"/>
+                <span class="category-name">&aboutNetworking.HTTP;</span>
             </div>
             <div class="category" id="category-sockets">
-                <span class="category-name" data-l10n-id="sockets"/>
+                <span class="category-name">&aboutNetworking.sockets;</span>
             </div>
             <div class="category" id="category-dns">
-                <span class="category-name" data-l10n-id="dns"/>
+                <span class="category-name">&aboutNetworking.dns;</span>
             </div>
             <div class="category" id="category-websockets">
-                <span class="category-name" data-l10n-id="websockets"/>
+                <span class="category-name">&aboutNetworking.websockets;</span>
             </div>
             <hr></hr>
             <div class="category" id="category-dnslookuptool">
-                <span class="category-name" data-l10n-id="dns-lookup"/>
+                <span class="category-name">&aboutNetworking.dnsLookup;</span>
             </div>
             <div class="category" id="category-logging">
-                <span class="category-name" data-l10n-id="logging"/>
+                <span class="category-name">&aboutNetworking.logging;</span>
             </div>
             <div class="category" id="category-rcwn">
-                <span class="category-name" data-l10n-id="rcwn"/>
+                <span class="category-name">&aboutNetworking.rcwn;</span>
             </div>
         </div>
         <div class="main-content">
             <div class="header">
-                <div id="sectionTitle" class="header-name" data-l10n-id="http"/>
+                <div id="sectionTitle" class="header-name">
+                    &aboutNetworking.HTTP;
+                </div>
                 <div id="refreshDiv" class="toggle-container-with-text">
-                    <button id="refreshButton" data-l10n-id="refresh"/>
+                    <button id="refreshButton">&aboutNetworking.refresh;</button>
                     <input id="autorefcheck" type="checkbox" name="Autorefresh" role="checkbox" />
-                    <label for="autorefcheck" data-l10n-id="auto-refresh"/>
+                    <label for="autorefcheck">&aboutNetworking.autoRefresh;</label>
                 </div>
             </div>
 
@@ -64,12 +70,12 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="hostname"/>
-                          <th data-l10n-id="port"/>
-                          <th data-l10n-id="http2"/>
-                          <th data-l10n-id="ssl"/>
-                          <th data-l10n-id="active"/>
-                          <th data-l10n-id="idle"/>
+                          <th>&aboutNetworking.hostname;</th>
+                          <th>&aboutNetworking.port;</th>
+                          <th>&aboutNetworking.http2;</th>
+                          <th>&aboutNetworking.ssl;</th>
+                          <th>&aboutNetworking.active;</th>
+                          <th>&aboutNetworking.idle;</th>
                       </tr>
                   </thead>
                   <tbody id="http_content" />
@@ -80,12 +86,12 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="host"/>
-                          <th data-l10n-id="port"/>
-                          <th data-l10n-id="tcp"/>
-                          <th data-l10n-id="active"/>
-                          <th data-l10n-id="sent"/>
-                          <th data-l10n-id="received"/>
+                          <th>&aboutNetworking.host;</th>
+                          <th>&aboutNetworking.port;</th>
+                          <th>&aboutNetworking.tcp;</th>
+                          <th>&aboutNetworking.active;</th>
+                          <th>&aboutNetworking.sent;</th>
+                          <th>&aboutNetworking.received;</th>
                       </tr>
                   </thead>
                   <tbody id="sockets_content" />
@@ -96,11 +102,11 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="hostname"/>
-                          <th data-l10n-id="family"/>
-                          <th data-l10n-id="trr"/>
-                          <th data-l10n-id="addresses"/>
-                          <th data-l10n-id="expires"/>
+                          <th>&aboutNetworking.hostname;</th>
+                          <th>&aboutNetworking.family;</th>
+                          <th>&aboutNetworking.trr;</th>
+                          <th>&aboutNetworking.addresses;</th>
+                          <th>&aboutNetworking.expires;</th>
                       </tr>
                   </thead>
                   <tbody id="dns_content" />
@@ -111,26 +117,26 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="hostname"/>
-                          <th data-l10n-id="ssl"/>
-                          <th data-l10n-id="messages-sent"/>
-                          <th data-l10n-id="messages-received"/>
-                          <th data-l10n-id="bytes-sent"/>
-                          <th data-l10n-id="bytesReceived"/>
+                          <th>&aboutNetworking.hostname;</th>
+                          <th>&aboutNetworking.ssl;</th>
+                          <th>&aboutNetworking.messagesSent;</th>
+                          <th>&aboutNetworking.messagesReceived;</th>
+                          <th>&aboutNetworking.bytesSent;</th>
+                          <th>&aboutNetworking.bytesReceived;</th>
                       </tr>
                   </thead>
                   <tbody id="websockets_content" />
               </table>
           </div>
 
-          <div id="dnslookuptool" class="tab" hidden="true" data-l10n-id="dns-domain">
-              <input type="text" name="host" id="host"></input>
-              <button id="dnsLookupButton" data-l10n-id="dns-lookup-button"/>
+          <div id="dnslookuptool" class="tab" hidden="true">
+              &aboutNetworking.dnsDomain;: <input type="text" name="host" id="host"></input>
+              <button id="dnsLookupButton">&aboutNetworking.dnsLookupButton;</button>
               <hr/>
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="dns-lookup-table-column"/>
+                          <th>&aboutNetworking.dnsLookupTableColumn;</th>
                       </tr>
                   </thead>
                   <tbody id="dnslookuptool_content" />
@@ -141,10 +147,10 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="rcwn-status"/>
-                          <th data-l10n-id="total-network-requests"/>
-                          <th data-l10n-id="rcwn-cache-won-count"/>
-                          <th data-l10n-id="rcwn-net-won-count"/>
+                          <th>&aboutNetworking.rcwnStatus;</th>
+                          <th>&aboutNetworking.totalNetworkRequests;</th>
+                          <th>&aboutNetworking.rcwnCacheWonCount;</th>
+                          <th>&aboutNetworking.rcwnNetWonCount;</th>
                       </tr>
                   </thead>
                   <tbody id="rcwn_content">
@@ -162,33 +168,33 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="rcwn-operation"/>
-                          <th data-l10n-id="rcwn-avg-short"/>
-                          <th data-l10n-id="rcwn-avg-long"/>
-                          <th data-l10n-id="rcwn-std-dev-long"/>
+                          <th>&aboutNetworking.rcwnOperation;</th>
+                          <th>&aboutNetworking.rcwnAvgShort;</th>
+                          <th>&aboutNetworking.rcwnAvgLong;</th>
+                          <th>&aboutNetworking.rcwnStddevLong;</th>
                       </tr>
                   </thead>
                   <tbody id="cacheperf_content">
                       <tr>
-                          <td data-l10n-id="rcwn-perf-open"/>
+                          <td>&aboutNetworking.rcwnPerfOpen;</td>
                           <td id="rcwn_perfstats_open_avgShort"> </td>
                           <td id="rcwn_perfstats_open_avgLong"> </td>
                           <td id="rcwn_perfstats_open_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td data-l10n-id="rcwn-perf-read"/>
+                          <td>&aboutNetworking.rcwnPerfRead;</td>
                           <td id="rcwn_perfstats_read_avgShort"> </td>
                           <td id="rcwn_perfstats_read_avgLong"> </td>
                           <td id="rcwn_perfstats_read_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td data-l10n-id="rcwn-perf-write"/>
+                          <td>&aboutNetworking.rcwnPerfWrite;</td>
                           <td id="rcwn_perfstats_write_avgShort"> </td>
                           <td id="rcwn_perfstats_write_avgLong"> </td>
                           <td id="rcwn_perfstats_write_stddevLong"> </td>
                       </tr>
                       <tr>
-                          <td data-l10n-id="rcwn-perf-entry-open"/>
+                          <td>&aboutNetworking.rcwnPerfEntryOpen;</td>
                           <td id="rcwn_perfstats_entryopen_avgShort"> </td>
                           <td id="rcwn_perfstats_entryopen_avgLong"> </td>
                           <td id="rcwn_perfstats_entryopen_stddevLong"> </td>
@@ -201,8 +207,8 @@
               <table>
                   <thead>
                       <tr>
-                          <th data-l10n-id="rcwn-cache-slow"/>
-                          <th data-l10n-id="rcwn-cache-not-slow"/>
+                          <th>&aboutNetworking.rcwnCacheSlow;</th>
+                          <th>&aboutNetworking.rcwnCacheNotSlow;</th>
                       </tr>
                   </thead>
                   <tbody>
@@ -216,24 +222,24 @@
 
           <div id="logging" class="tab" hidden="true">
             <div>
-                <a href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging' data-l10n-name="logging"></a>
+              &aboutNetworking.logTutorial;
             </div>
             <br/>
             <div>
-              <button id="start-logging-button" data-l10n-id="start-logging"/>
-              <button id="stop-logging-button" data-l10n-id="stop-logging"/>
+              <button id="start-logging-button"> &aboutNetworking.startLogging; </button>
+              <button id="stop-logging-button"> &aboutNetworking.stopLogging; </button>
             </div>
             <br/>
             <br/>
-            <div data-l10n-id="current-log-file">
-              <div id="current-log-file"></div><br/>
+            <div>
+              &aboutNetworking.currentLogFile; <div id="current-log-file"></div><br/>
               <input type="text" name="log-file" id="log-file"></input>
-              <button id="set-log-file-button" data-l10n-id="set-log-file"/>
+              <button id="set-log-file-button"> &aboutNetworking.setLogFile; </button>
             </div>
-            <div data-l10n-id="current-log-modules">
-              <div id="current-log-modules"></div><br/>
+            <div>
+              &aboutNetworking.currentLogModules; <div id="current-log-modules"></div><br/>
               <input type="text" name="log-modules" id="log-modules" value="timestamp,sync,nsHttp:5,cache2:5,nsSocketTransport:5,nsHostResolver:5"></input>
-              <button id="set-log-modules-button" data-l10n-id="set-log-modules"/>
+              <button id="set-log-modules-button"> &aboutNetworking.setLogModules; </button>
             </div>
           </div>
 
diff --git a/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd b/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
new file mode 100644
index 000000000000..63ecb44fddd3
--- /dev/null
+++ b/toolkit/locales/en-US/chrome/global/aboutNetworking.dtd
@@ -0,0 +1,59 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!ENTITY aboutNetworking.title                 "About Networking">
+<!ENTITY aboutNetworking.warning               "This is very experimental. Do not use without adult supervision.">
+<!ENTITY aboutNetworking.showNextTime          "Show this warning next time">
+<!ENTITY aboutNetworking.ok                    "OK">
+<!ENTITY aboutNetworking.HTTP                  "HTTP">
+<!ENTITY aboutNetworking.sockets               "Sockets">
+<!ENTITY aboutNetworking.dns                   "DNS">
+<!ENTITY aboutNetworking.websockets            "WebSockets">
+<!ENTITY aboutNetworking.refresh               "Refresh">
+<!ENTITY aboutNetworking.autoRefresh           "Autorefresh every 3 seconds">
+<!ENTITY aboutNetworking.hostname              "Hostname">
+<!ENTITY aboutNetworking.port                  "Port">
+<!ENTITY aboutNetworking.http2                 "HTTP/2">
+<!ENTITY aboutNetworking.ssl                   "SSL">
+<!ENTITY aboutNetworking.active                "Active">
+<!ENTITY aboutNetworking.idle                  "Idle">
+<!ENTITY aboutNetworking.host                  "Host">
+<!ENTITY aboutNetworking.tcp                   "TCP">
+<!ENTITY aboutNetworking.sent                  "Sent">
+<!ENTITY aboutNetworking.received              "Received">
+<!ENTITY aboutNetworking.family                "Family">
+<!ENTITY aboutNetworking.trr                   "TRR">
+<!ENTITY aboutNetworking.addresses             "Addresses">
+<!ENTITY aboutNetworking.expires               "Expires (Seconds)">
+<!ENTITY aboutNetworking.messagesSent          "Messages Sent">
+<!ENTITY aboutNetworking.messagesReceived      "Messages Received">
+<!ENTITY aboutNetworking.bytesSent             "Bytes Sent">
+<!ENTITY aboutNetworking.bytesReceived         "Bytes Received">
+<!ENTITY aboutNetworking.logging               "Logging">
+<!ENTITY aboutNetworking.logTutorial           "See <a href='https://developer.mozilla.org/docs/Mozilla/Debugging/HTTP_logging'>HTTP Logging</a> for instructions on how to use this tool.">
+<!ENTITY aboutNetworking.currentLogFile        "Current Log File:">
+<!ENTITY aboutNetworking.currentLogModules     "Current Log Modules:">
+<!ENTITY aboutNetworking.setLogFile            "Set Log File">
+<!ENTITY aboutNetworking.setLogModules         "Set Log Modules">
+<!ENTITY aboutNetworking.startLogging          "Start Logging">
+<!ENTITY aboutNetworking.stopLogging           "Stop Logging">
+<!ENTITY aboutNetworking.dnsLookup             "DNS Lookup">
+<!ENTITY aboutNetworking.dnsLookupButton       "Resolve">
+<!ENTITY aboutNetworking.dnsDomain             "Domain">
+<!ENTITY aboutNetworking.dnsLookupTableColumn  "IPs">
+<!ENTITY aboutNetworking.rcwn                  "RCWN Stats">
+<!ENTITY aboutNetworking.rcwnStatus            "RCWN Status">
+<!ENTITY aboutNetworking.rcwnCacheWonCount     "Cache won count">
+<!ENTITY aboutNetworking.rcwnNetWonCount       "Net won count">
+<!ENTITY aboutNetworking.totalNetworkRequests  "Total network request count">
+<!ENTITY aboutNetworking.rcwnOperation         "Cache Operation">
+<!ENTITY aboutNetworking.rcwnPerfOpen          "Open">
+<!ENTITY aboutNetworking.rcwnPerfRead          "Read">
+<!ENTITY aboutNetworking.rcwnPerfWrite         "Write">
+<!ENTITY aboutNetworking.rcwnPerfEntryOpen     "Entry Open">
+<!ENTITY aboutNetworking.rcwnAvgShort          "Short Average">
+<!ENTITY aboutNetworking.rcwnAvgLong           "Long Average">
+<!ENTITY aboutNetworking.rcwnStddevLong        "Long Standard Deviation">
+<!ENTITY aboutNetworking.rcwnCacheSlow         "Cache slow count">
+<!ENTITY aboutNetworking.rcwnCacheNotSlow      "Cache not slow count">
diff --git a/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl b/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl
deleted file mode 100644
index a3f4e0d518fc..000000000000
--- a/toolkit/locales/en-US/toolkit/about/aboutNetworking.ftl
+++ /dev/null
@@ -1,61 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-title = About Networking
-warning = This is very experimental. Do not use without adult supervision.
-show-next-time-checkbox = Show this warning next time
-ok = OK
-http = HTTP
-sockets = Sockets
-dns = DNS
-websockets = WebSockets
-refresh = Refresh
-auto-refresh = Autorefresh every 3 seconds
-hostname = Hostname
-port = Port
-http2 = HTTP/2
-ssl = SSL
-active = Active
-idle = Idle
-host = Host
-tcp = TCP
-sent = Sent
-received = Received
-family = Family
-trr = TRR
-addresses = Addresses
-expires = Expires (Seconds)
-messages-sent = Messages Sent
-messages-received = Messages Received
-bytes-sent = Bytes Sent
-bytes-received = Bytes Received
-logging = Logging
-log-tutorial =
-    See <a data-l10n-name="logging">HTTP Logging</a>
-    for instructions on how to use this tool.
-current-log-file = Current Log File:
-current-log-modules = Current Log Modules:
-set-log-file = Set Log File
-set-log-modules = Set Log Modules
-start-logging = Start Logging
-stop-logging = Stop Logging
-dns-lookup = DNS Lookup
-dns-lookup-button = Resolve
-dns-domain = Domain
-dns-lookup-table-column = IPs
-rcwn = RCWN Stats
-rcwn-status = RCWN Status
-rcwn-cache-won-count = Cache won count
-rcwn-net-won-count = Net won count
-total-network-requests = Total network request count
-rcwn-operation = Cache Operation
-rcwn-perf-open = Open
-rcwn-perf-read = Read
-rcwn-perf-write = Write
-rcwn-perf-entry-open = Entry Open
-rcwn-avg-short = Short Average
-rcwn-avg-long = Long Average
-rcwn-std-dev-long = Long Standard Deviation
-rcwn-cache-slow = Cache slow count
-rcwn-cache-not-slow = Cache not slow count
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 53435714a83a..b823d47bc8e8 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -11,6 +11,7 @@
 % locale global @AB_CD@ %locale/@AB_CD@/global/
   locale/@AB_CD@/global/aboutReader.properties          (%chrome/global/aboutReader.properties)
   locale/@AB_CD@/global/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
+  locale/@AB_CD@/global/aboutNetworking.dtd             (%chrome/global/aboutNetworking.dtd)
   locale/@AB_CD@/global/aboutStudies.properties         (%chrome/global/aboutStudies.properties)
   locale/@AB_CD@/global/aboutServiceWorkers.dtd         (%chrome/global/aboutServiceWorkers.dtd)
   locale/@AB_CD@/global/aboutServiceWorkers.properties  (%chrome/global/aboutServiceWorkers.properties)

From c6f2eb772c5b70310949388ce540440e925ded70 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Thu, 8 Nov 2018 22:05:24 +0200
Subject: [PATCH 21/77] Backed out changeset e83fe676d538 (bug 1505801) for
 failures on /browser_ext_themes_findbar.js. CLOSED TREE

---
 browser/themes/linux/browser.css   | 5 -----
 browser/themes/osx/browser.css     | 4 ++--
 browser/themes/windows/browser.css | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
index 5ab69b97ac6b..6d2e3d6c8895 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -451,11 +451,6 @@ notification[value="translation"] menulist > .menulist-dropmarker {
 .browserContainer > findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
-}
-
-.browserContainer > findbar:-moz-lwtheme {
-  background-color: var(--lwt-accent-color);
-  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   text-shadow: none;
 }
 
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
index 57bd3b71a23b..474edc2b6cda 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -566,8 +566,8 @@ html|input.urlbar-input {
 }
 
 .browserContainer > findbar:-moz-lwtheme {
-  background-color: var(--lwt-accent-color);
-  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
+  background-color: var(--toolbar-bgcolor);
+  background-image: none;
   color: var(--toolbar-color);
 }
 
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
index 8b88afaa202c..9419a6e70135 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -665,11 +665,6 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
 .browserContainer > findbar {
   background-color: var(--toolbar-bgcolor);
   color: var(--toolbar-color);
-}
-
-.browserContainer > findbar:-moz-lwtheme {
-  background-color: var(--lwt-accent-color);
-  background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor));
   text-shadow: none;
 }
 

From ce1a763fd81b9d4ad15090086ac303a076a521ae Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Thu, 8 Nov 2018 22:19:57 +0200
Subject: [PATCH 22/77] Backed out 2 changesets (bug 1505739) for css failures
 e.g. /css/css-ui/caret-color-013.html. CLOSED TREE

Backed out changeset 135bb7f0d1a8 (bug 1505739)
Backed out changeset ea50b8a6a2a7 (bug 1505739)
---
 taskcluster/ci/test/web-platform.yml               | 11 +++++++++--
 testing/mozharness/scripts/web_platform_tests.py   |  3 +++
 .../CSS2/backgrounds/background-color-049.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-052.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-053.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-054.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-070.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-073.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-074.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-075.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-090.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-093.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-094.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-095.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-110.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-113.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-114.xht.ini  |  4 ++++
 .../CSS2/backgrounds/background-color-115.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-010.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-011.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-012.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-013.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-014.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-015.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-016.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-017.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-018.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-019.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-020.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-021.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-022.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-023.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-024.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-025.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-026.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-027.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-028.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-029.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-030.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-031.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-032.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-033.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-034.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-035.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-036.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-037.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-038.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-039.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-040.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-041.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-042.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-043.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-044.xht.ini  |  4 ++++
 .../css/CSS2/bidi-text/bidi-box-model-045.xht.ini  |  4 ++++
 .../bidi-text/direction-applies-to-001.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-002.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-003.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-004.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-005.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-006.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-007.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-009.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-012.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-013.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-014.xht.ini     |  4 ++++
 .../bidi-text/direction-applies-to-015.xht.ini     |  4 ++++
 .../CSS2/bidi-text/line-breaking-bidi-001.xht.ini  |  4 ++++
 .../CSS2/bidi-text/line-breaking-bidi-002.xht.ini  |  4 ++++
 .../CSS2/bidi-text/line-breaking-bidi-003.xht.ini  |  4 ++++
 .../meta/css/CSS2/borders/border-001.xht.ini       |  4 ++++
 .../meta/css/CSS2/borders/border-003.xht.ini       |  4 ++++
 .../CSS2/borders/border-bottom-width-080.xht.ini   |  4 ++++
 .../CSS2/borders/border-bottom-width-083.xht.ini   |  4 ++++
 .../CSS2/borders/border-bottom-width-084.xht.ini   |  4 ++++
 .../css/CSS2/borders/border-left-width-080.xht.ini |  4 ++++
 .../css/CSS2/borders/border-left-width-083.xht.ini |  4 ++++
 .../css/CSS2/borders/border-left-width-084.xht.ini |  4 ++++
 .../CSS2/borders/border-right-width-080.xht.ini    |  4 ++++
 .../CSS2/borders/border-right-width-083.xht.ini    |  4 ++++
 .../CSS2/borders/border-right-width-084.xht.ini    |  4 ++++
 .../css/CSS2/borders/border-top-width-080.xht.ini  |  4 ++++
 .../css/CSS2/borders/border-top-width-083.xht.ini  |  4 ++++
 .../css/CSS2/borders/border-top-width-084.xht.ini  |  4 ++++
 .../borders/border-width-applies-to-008.xht.ini    |  4 ++++
 .../anonymous-boxes-inheritance-001.xht.ini        |  4 ++++
 .../box-display/block-in-inline-relpos-001.xht.ini |  4 ++++
 .../CSS2/box-display/display-change-001.xht.ini    |  4 ++++
 .../meta/css/CSS2/colors/color-001.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-002.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-003.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-004.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-005.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-006.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-007.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-008.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-009.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-010.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-011.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-012.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-013.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-014.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-015.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-016.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-017.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-018.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-019.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-020.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-021.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-022.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-023.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-024.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-025.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-026.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-027.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-028.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-029.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-031.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-032.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-033.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-034.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-035.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-036.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-037.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-038.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-039.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-040.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-041.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-042.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-043.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-044.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-045.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-046.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-047.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-048.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-049.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-050.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-051.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-052.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-053.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-054.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-055.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-056.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-057.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-058.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-059.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-060.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-061.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-062.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-063.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-064.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-065.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-066.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-067.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-068.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-069.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-070.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-071.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-072.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-073.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-074.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-075.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-076.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-077.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-078.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-079.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-080.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-081.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-082.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-083.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-084.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-085.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-086.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-087.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-088.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-089.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-090.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-091.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-092.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-093.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-094.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-095.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-096.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-097.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-098.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-099.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-100.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-101.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-102.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-103.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-104.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-105.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-106.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-107.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-108.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-109.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-110.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-111.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-112.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-113.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-114.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-115.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-116.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-117.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-118.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-119.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-120.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-121.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-122.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-123.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-124.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-125.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-126.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-127.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-128.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-129.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-130.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-131.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-132.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-133.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-134.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-135.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-136.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-137.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-138.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-139.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-140.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-141.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-142.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-143.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-144.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-145.xht.ini         |  3 +++
 .../meta/css/CSS2/colors/color-174.xht.ini         |  3 +++
 .../meta/css/CSS2/css1/c412-blockw-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c412-hz-box-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c44-ln-box-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c44-ln-box-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c44-ln-box-002.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c44-ln-box-003.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c526-font-sz-001.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c526-font-sz-002.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c526-font-sz-003.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c534-bgre-000.xht.ini       |  3 +++
 .../meta/css/CSS2/css1/c534-bgre-001.xht.ini       |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-001.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-002.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-003.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-004.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c534-bgreps-005.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c536-bgpos-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c536-bgpos-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c541-word-sp-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c542-letter-sp-000.xht.ini  |  3 +++
 .../meta/css/CSS2/css1/c542-letter-sp-001.xht.ini  |  3 +++
 .../meta/css/CSS2/css1/c544-valgn-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c547-indent-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c548-leadin-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c548-ln-ht-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c548-ln-ht-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c548-ln-ht-002.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c548-ln-ht-003.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c548-ln-ht-004.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5505-mrgn-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c5505-mrgn-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c5505-mrgn-003.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5506-padn-t-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5507-padn-r-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5507-padn-r-001.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5509-padn-l-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5509-padn-l-001.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c5510-padn-001.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c5525-fltblck-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5525-fltinln-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c5526-fltclr-000.xht.ini    |  3 +++
 .../meta/css/CSS2/css1/c562-white-sp-000.xht.ini   |  3 +++
 .../meta/css/CSS2/css1/c61-ex-len-000.xht.ini      |  3 +++
 .../meta/css/CSS2/css1/c61-rel-len-000.xht.ini     |  3 +++
 .../meta/css/CSS2/css1/c62-percent-000.xht.ini     |  3 +++
 .../clear-clearance-calculation-005.xht.ini        |  3 +++
 .../meta/css/CSS2/floats-clear/float-005.xht.ini   |  3 +++
 .../float-non-replaced-width-007.xht.ini           |  3 +++
 .../float-non-replaced-width-008.xht.ini           |  3 +++
 .../float-non-replaced-width-009.xht.ini           |  3 +++
 .../float-non-replaced-width-010.xht.ini           |  3 +++
 .../float-non-replaced-width-011.xht.ini           |  3 +++
 .../float-non-replaced-width-012.xht.ini           |  3 +++
 .../meta/css/CSS2/floats-clear/floats-006.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-009.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-111.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-112.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-113.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-115.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-116.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-117.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-118.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-119.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-120.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-121.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-122.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-123.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-132.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-133.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-134.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-136.xht.ini  |  3 +++
 .../meta/css/CSS2/floats-clear/floats-145.xht.ini  |  3 +++
 .../meta/css/CSS2/fonts/font-011.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-012.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-013.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-014.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-015.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-016.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-029.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-030.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-031.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-032.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-042.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-043.xht.ini           | 13 ++-----------
 .../meta/css/CSS2/fonts/font-051.xht.ini           |  3 +++
 .../meta/css/CSS2/fonts/font-family-009.xht.ini    |  3 +++
 .../CSS2/fonts/font-family-applies-to-001.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-002.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-005.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-006.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-007.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-008.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-009.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-010.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-011.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-014.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-015.xht.ini  | 13 ++-----------
 .../CSS2/fonts/font-family-applies-to-017.xht.ini  | 13 ++-----------
 .../meta/css/CSS2/fonts/font-size-120.xht.ini      |  3 +++
 .../meta/css/CSS2/fonts/font-size-122.xht.ini      | 13 ++-----------
 .../meta/css/CSS2/fonts/font-size-124.xht.ini      |  3 +++
 .../meta/css/CSS2/fonts/fonts-010.xht.ini          |  3 +++
 .../meta/css/CSS2/fonts/fonts-011.xht.ini          |  3 +++
 .../CSS2/linebox/border-padding-bleed-001.xht.ini  |  4 ++++
 .../CSS2/linebox/border-padding-bleed-002.xht.ini  |  4 ++++
 .../CSS2/linebox/border-padding-bleed-003.xht.ini  |  4 ++++
 .../linebox/inline-formatting-context-008.xht.ini  |  4 ++++
 .../linebox/inline-formatting-context-009.xht.ini  |  4 ++++
 .../linebox/inline-formatting-context-011.xht.ini  |  4 ++++
 .../linebox/inline-formatting-context-013.xht.ini  |  4 ++++
 .../linebox/inline-formatting-context-022.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/leading-001.xht.ini      |  4 ++++
 .../meta/css/CSS2/linebox/line-height-002.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-004.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-005.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-006.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-007.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-013.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-015.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-016.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-017.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-018.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-024.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-025.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-026.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-027.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-028.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-029.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-035.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-037.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-038.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-039.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-040.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-046.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-048.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-049.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-050.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-051.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-057.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-058.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-059.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-060.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-061.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-062.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-068.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-069.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-070.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-071.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-072.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-073.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-079.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-080.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-081.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-082.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-083.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-084.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-090.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-092.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-093.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-094.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-095.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-101.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-102.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-103.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-104.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-105.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-106.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-112.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-121.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-127.xht.ini  |  4 ++++
 .../meta/css/CSS2/linebox/line-height-128.xht.ini  |  4 ++++
 .../css/CSS2/linebox/line-height-bleed-002.xht.ini |  4 ++++
 .../css/CSS2/linebox/vertical-align-004.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-005.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-006.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-007.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-008.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-016.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-017.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-018.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-019.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-020.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-028.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-029.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-030.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-031.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-032.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-040.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-041.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-042.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-043.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-044.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-052.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-053.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-054.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-055.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-056.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-064.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-065.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-066.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-067.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-068.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-076.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-077.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-078.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-079.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-080.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-088.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-089.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-090.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-091.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-092.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-100.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-101.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-102.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-103.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-104.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-109.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-110.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-111.xht.ini    |  4 ++++
 .../css/CSS2/linebox/vertical-align-117a.xht.ini   |  4 ++++
 .../css/CSS2/linebox/vertical-align-118a.xht.ini   |  4 ++++
 .../css/CSS2/linebox/vertical-align-121.xht.ini    |  4 ++++
 .../linebox/vertical-align-applies-to-001.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-002.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-003.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-004.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-005.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-006.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-007.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-008.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-009.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-012.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-013.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-014.xht.ini  |  4 ++++
 .../linebox/vertical-align-applies-to-015.xht.ini  |  4 ++++
 .../linebox/vertical-align-baseline-001.xht.ini    |  4 ++++
 .../linebox/vertical-align-baseline-002.xht.ini    |  4 ++++
 .../linebox/vertical-align-baseline-004a.xht.ini   | 12 +++++-------
 .../linebox/vertical-align-baseline-005a.xht.ini   | 12 +++++-------
 .../margin-border-padding-001.xht.ini              |  3 +++
 .../margin-padding-clear/margin-bottom-091.xht.ini |  3 +++
 .../margin-padding-clear/margin-bottom-092.xht.ini |  3 +++
 .../margin-bottom-applies-to-008.xht.ini           |  3 +++
 .../margin-collapse-106.xht.ini                    |  3 +++
 .../margin-collapse-130.xht.ini                    |  3 +++
 .../margin-collapse-131.xht.ini                    |  3 +++
 .../margin-collapse-137.xht.ini                    |  3 +++
 .../margin-collapse-138.xht.ini                    |  3 +++
 .../margin-collapse-155.xht.ini                    |  3 +++
 .../margin-padding-clear/margin-inline-001.xht.ini |  3 +++
 .../margin-padding-clear/margin-left-091.xht.ini   |  3 +++
 .../margin-padding-clear/margin-left-092.xht.ini   |  3 +++
 .../margin-padding-clear/margin-right-091.xht.ini  |  3 +++
 .../margin-padding-clear/margin-right-092.xht.ini  |  3 +++
 .../margin-padding-clear/margin-top-091.xht.ini    |  3 +++
 .../margin-padding-clear/margin-top-092.xht.ini    |  3 +++
 .../margin-top-applies-to-008.xht.ini              |  3 +++
 .../padding-bottom-080.xht.ini                     |  3 +++
 .../padding-bottom-083.xht.ini                     |  3 +++
 .../padding-bottom-084.xht.ini                     |  3 +++
 .../margin-padding-clear/padding-left-080.xht.ini  |  3 +++
 .../margin-padding-clear/padding-left-083.xht.ini  |  3 +++
 .../margin-padding-clear/padding-left-084.xht.ini  |  3 +++
 .../margin-padding-clear/padding-right-080.xht.ini |  3 +++
 .../margin-padding-clear/padding-right-083.xht.ini |  3 +++
 .../margin-padding-clear/padding-right-084.xht.ini |  3 +++
 .../margin-padding-clear/padding-top-080.xht.ini   |  3 +++
 .../margin-padding-clear/padding-top-083.xht.ini   |  3 +++
 .../margin-padding-clear/padding-top-084.xht.ini   |  3 +++
 .../block-formatting-contexts-004.xht.ini          |  3 +++
 .../block-non-replaced-height-005.xht.ini          |  3 +++
 .../block-non-replaced-width-007.xht.ini           |  3 +++
 .../normal-flow/block-replaced-width-006.xht.ini   |  3 +++
 .../meta/css/CSS2/normal-flow/blocks-017.xht.ini   |  3 +++
 .../meta/css/CSS2/normal-flow/height-080.xht.ini   |  3 +++
 .../meta/css/CSS2/normal-flow/height-083.xht.ini   |  3 +++
 .../meta/css/CSS2/normal-flow/height-084.xht.ini   |  3 +++
 .../inline-block-non-replaced-width-001.xht.ini    |  3 +++
 .../inline-block-non-replaced-width-002.xht.ini    |  3 +++
 .../inline-block-non-replaced-width-003.xht.ini    |  3 +++
 .../inline-block-non-replaced-width-004.xht.ini    |  3 +++
 .../inline-non-replaced-height-002.xht.ini         |  3 +++
 .../inline-non-replaced-height-003.xht.ini         |  3 +++
 .../inline-non-replaced-width-001.xht.ini          |  3 +++
 .../inline-non-replaced-width-002.xht.ini          |  3 +++
 .../meta/css/CSS2/normal-flow/inlines-016.xht.ini  |  3 +++
 .../meta/css/CSS2/normal-flow/inlines-017.xht.ini  |  3 +++
 .../css/CSS2/normal-flow/max-height-080.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/max-height-083.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/max-height-084.xht.ini    |  3 +++
 .../normal-flow/max-height-applies-to-008.xht.ini  |  3 +++
 .../css/CSS2/normal-flow/max-width-080.xht.ini     |  3 +++
 .../css/CSS2/normal-flow/max-width-083.xht.ini     |  3 +++
 .../css/CSS2/normal-flow/max-width-084.xht.ini     |  3 +++
 .../css/CSS2/normal-flow/max-width-107.xht.ini     |  3 +++
 .../normal-flow/max-width-applies-to-008.xht.ini   |  3 +++
 .../css/CSS2/normal-flow/min-height-067.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-068.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-070.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-071.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-078.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-079.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-080.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-081.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-082.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-083.xht.ini    |  3 +++
 .../css/CSS2/normal-flow/min-height-084.xht.ini    |  3 +++
 .../normal-flow/min-height-applies-to-008.xht.ini  |  3 +++
 .../css/CSS2/normal-flow/min-width-080.xht.ini     |  3 +++
 .../css/CSS2/normal-flow/min-width-083.xht.ini     |  3 +++
 .../css/CSS2/normal-flow/min-width-084.xht.ini     |  3 +++
 .../normal-flow/min-width-applies-to-008.xht.ini   |  3 +++
 .../meta/css/CSS2/normal-flow/width-080.xht.ini    |  3 +++
 .../meta/css/CSS2/normal-flow/width-083.xht.ini    |  3 +++
 .../meta/css/CSS2/normal-flow/width-084.xht.ini    |  3 +++
 .../absolute-non-replaced-height-002.xht.ini       |  3 +++
 .../absolute-non-replaced-height-007.xht.ini       |  3 +++
 .../absolute-non-replaced-height-009.xht.ini       |  3 +++
 .../absolute-non-replaced-max-height-002.xht.ini   |  3 +++
 .../absolute-non-replaced-width-001.xht.ini        |  3 +++
 .../absolute-non-replaced-width-002.xht.ini        |  3 +++
 .../absolute-non-replaced-width-003.xht.ini        |  3 +++
 .../absolute-non-replaced-width-004.xht.ini        |  3 +++
 .../absolute-non-replaced-width-005.xht.ini        |  3 +++
 .../absolute-non-replaced-width-006.xht.ini        |  3 +++
 .../absolute-non-replaced-width-007.xht.ini        |  3 +++
 .../absolute-non-replaced-width-008.xht.ini        |  3 +++
 .../absolute-non-replaced-width-010.xht.ini        |  3 +++
 .../absolute-non-replaced-width-011.xht.ini        |  3 +++
 .../absolute-non-replaced-width-012.xht.ini        |  3 +++
 .../absolute-non-replaced-width-013.xht.ini        |  3 +++
 .../absolute-non-replaced-width-014.xht.ini        |  3 +++
 .../absolute-non-replaced-width-016.xht.ini        |  3 +++
 .../absolute-non-replaced-width-017.xht.ini        |  3 +++
 .../absolute-non-replaced-width-018.xht.ini        |  3 +++
 .../absolute-non-replaced-width-019.xht.ini        |  3 +++
 .../absolute-non-replaced-width-020.xht.ini        |  3 +++
 .../absolute-non-replaced-width-021.xht.ini        |  3 +++
 .../absolute-non-replaced-width-022.xht.ini        |  3 +++
 .../absolute-non-replaced-width-023.xht.ini        |  3 +++
 .../absolute-non-replaced-width-024.xht.ini        |  3 +++
 .../meta/css/CSS2/positioning/bottom-091.xht.ini   |  3 +++
 .../meta/css/CSS2/positioning/bottom-092.xht.ini   |  3 +++
 .../meta/css/CSS2/positioning/left-091.xht.ini     |  3 +++
 .../meta/css/CSS2/positioning/left-092.xht.ini     |  3 +++
 .../CSS2/positioning/position-relative-033.xht.ini |  3 +++
 .../meta/css/CSS2/positioning/right-091.xht.ini    |  3 +++
 .../meta/css/CSS2/positioning/right-092.xht.ini    |  3 +++
 .../meta/css/CSS2/positioning/top-091.xht.ini      |  3 +++
 .../meta/css/CSS2/positioning/top-092.xht.ini      |  3 +++
 .../CSS2/selectors/first-line-pseudo-012.xht.ini   |  4 ++++
 .../CSS2/selectors/first-line-pseudo-013.xht.ini   |  4 ++++
 .../CSS2/selectors/first-line-pseudo-014.xht.ini   |  4 ++++
 .../CSS2/selectors/first-line-pseudo-015.xht.ini   |  4 ++++
 .../CSS2/selectors/first-line-pseudo-016.xht.ini   |  4 ++++
 .../tables/collapsing-border-model-010a.xht.ini    |  3 +++
 .../tables/collapsing-border-model-010b.xht.ini    |  3 +++
 .../tables/table-height-algorithm-008a.xht.ini     |  3 +++
 .../tables/table-height-algorithm-008b.xht.ini     |  3 +++
 .../tables/table-height-algorithm-008c.xht.ini     |  3 +++
 .../meta/css/CSS2/tables/table-margin-004.xht.ini  |  3 +++
 .../text/letter-spacing-applies-to-001.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-002.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-006.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-008.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-009.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-010.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-011.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-014.xht.ini     |  4 ++++
 .../text/letter-spacing-applies-to-015.xht.ini     |  4 ++++
 .../CSS2/text/painting-order-underline-001.xht.ini |  4 ++++
 .../meta/css/CSS2/text/text-align-bidi-011.xht.ini |  4 ++++
 .../CSS2/text/text-align-white-space-001.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-002.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-003.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-004.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-005.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-006.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-007.xht.ini   |  4 ++++
 .../CSS2/text/text-align-white-space-008.xht.ini   |  4 ++++
 .../meta/css/CSS2/text/text-indent-007.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-008.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-012.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-019.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-020.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-031.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-032.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-043.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-044.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-055.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-056.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-067.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-068.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-079.xht.ini     |  4 ++++
 .../meta/css/CSS2/text/text-indent-080.xht.ini     |  4 ++++
 .../CSS2/text/white-space-collapsing-001.xht.ini   |  4 ++++
 .../CSS2/text/white-space-collapsing-002.xht.ini   |  4 ++++
 .../CSS2/text/white-space-collapsing-004.xht.ini   |  4 ++++
 .../CSS2/text/white-space-collapsing-005.xht.ini   |  4 ++++
 .../text/white-space-collapsing-bidi-002.xht.ini   |  4 ++++
 .../text/white-space-collapsing-bidi-003.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-mixed-002.xht.ini    |  4 ++++
 .../css/CSS2/text/white-space-normal-001.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-002.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-003.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-004.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-005.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-006.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-007.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-008.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-normal-009.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-nowrap-001.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-nowrap-005.xht.ini   |  4 ++++
 .../css/CSS2/text/white-space-nowrap-006.xht.ini   |  4 ++++
 .../meta/css/CSS2/text/white-space-pre-001.xht.ini |  4 ++++
 .../meta/css/CSS2/text/white-space-pre-002.xht.ini |  4 ++++
 .../meta/css/CSS2/text/white-space-pre-005.xht.ini |  4 ++++
 .../meta/css/CSS2/text/white-space-pre-006.xht.ini |  4 ++++
 .../CSS2/text/white-space-processing-049.xht.ini   |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-001.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-002.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-003.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-004.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-005.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-006.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-007.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-008.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-009.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-012.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-013.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-014.xht.ini    |  4 ++++
 .../css/CSS2/ui/overflow-applies-to-015.xht.ini    |  4 ++++
 .../meta/css/CSS2/values/numbers-units-007.xht.ini | 13 ++-----------
 .../meta/css/CSS2/values/numbers-units-009.xht.ini | 13 ++-----------
 .../meta/css/CSS2/values/numbers-units-010.xht.ini | 13 ++-----------
 .../meta/css/CSS2/values/numbers-units-012.xht.ini |  3 +++
 .../meta/css/CSS2/values/numbers-units-013.xht.ini |  3 +++
 .../meta/css/CSS2/values/numbers-units-015.xht.ini |  3 +++
 .../meta/css/CSS2/values/numbers-units-018.xht.ini |  3 +++
 .../meta/css/CSS2/values/numbers-units-019.xht.ini |  3 +++
 .../meta/css/CSS2/values/numbers-units-021.xht.ini | 13 ++-----------
 .../meta/css/CSS2/values/units-001.xht.ini         |  3 +++
 .../meta/css/CSS2/values/units-003.xht.ini         |  3 +++
 .../meta/css/CSS2/values/units-004.xht.ini         |  3 +++
 .../meta/css/CSS2/values/units-006.xht.ini         |  3 +++
 .../meta/css/CSS2/values/units-008.xht.ini         |  3 +++
 .../meta/css/CSS2/values/units-009.xht.ini         |  3 +++
 .../meta/css/CSS2/visufx/visibility-005.xht.ini    |  4 ++++
 .../css/CSS2/visuren/anonymous-boxes-001a.xht.ini  |  3 +++
 .../meta/css/CSS2/zindex/stack-floats-001.xht.ini  |  4 ++++
 .../meta/css/CSS2/zindex/stack-floats-002.xht.ini  |  4 ++++
 .../meta/css/CSS2/zindex/stack-floats-003.xht.ini  |  4 ++++
 .../meta/css/CSS2/zindex/stack-floats-004.xht.ini  |  4 ++++
 .../css/css-contain/contain-layout-002.html.ini    |  3 +++
 .../css/css-contain/contain-layout-003.html.ini    |  3 +++
 .../css/css-contain/contain-layout-004.html.ini    |  3 +++
 .../css/css-contain/contain-layout-009.html.ini    |  3 +++
 .../css/css-contain/contain-layout-010.html.ini    |  3 +++
 .../css/css-contain/contain-layout-011.html.ini    |  3 +++
 .../css/css-contain/contain-layout-012.html.ini    |  3 +++
 .../css/css-contain/contain-layout-018.html.ini    |  2 --
 .../css/css-contain/contain-paint-022.html.ini     |  3 +++
 .../css/css-contain/contain-paint-023.html.ini     |  3 +++
 .../css-contain/contain-size-breaks-001.html.ini   |  3 +++
 .../run-in/letter-spacing-applies-to-004.xht.ini   |  4 ++++
 .../meta/css/css-flexbox/align-items-004.htm.ini   |  4 ++++
 .../meta/css/css-flexbox/align-items-006.html.ini  |  4 ++++
 .../flex-minimum-width-flex-items-001.xht.ini      |  4 ++++
 .../flex-minimum-width-flex-items-003.xht.ini      |  4 ++++
 .../flexbox_flex-natural-mixed-basis-auto.html.ini |  4 ++++
 .../css/css-fonts/font-size-adjust-002.html.ini    |  4 ++++
 .../css/css-fonts/font-size-adjust-006.xht.ini     |  4 ++++
 .../css/css-fonts/font-size-adjust-007.xht.ini     |  4 ++++
 .../css/css-fonts/font-size-adjust-008.xht.ini     |  4 ++++
 ...lf-baseline-changes-grid-area-size-001.html.ini |  3 +++
 ...lf-baseline-changes-grid-area-size-004.html.ini |  3 +++
 ...lf-baseline-changes-grid-area-size-005.html.ini |  3 +++
 .../grid-template-columns-fit-content-001.html.ini |  4 ++++
 .../grid-template-rows-fit-content-001.html.ini    |  4 ++++
 .../grid-items/grid-inline-items-001.html.ini      |  4 ++++
 .../grid-items/grid-inline-items-002.html.ini      |  4 ++++
 .../grid-items/grid-inline-items-003.html.ini      |  4 ++++
 ...line-order-property-auto-placement-001.html.ini |  4 ++++
 ...line-order-property-auto-placement-002.html.ini |  4 ++++
 ...line-order-property-auto-placement-003.html.ini |  4 ++++
 ...line-order-property-auto-placement-004.html.ini |  4 ++++
 ...line-order-property-auto-placement-005.html.ini |  4 ++++
 ...rid-inline-order-property-painting-001.html.ini |  4 ++++
 ...rid-inline-order-property-painting-002.html.ini |  4 ++++
 ...rid-inline-order-property-painting-003.html.ini |  4 ++++
 ...rid-inline-order-property-painting-004.html.ini |  4 ++++
 ...rid-inline-order-property-painting-005.html.ini |  4 ++++
 .../grid-inline-z-axis-ordering-001.html.ini       |  4 ++++
 .../grid-inline-z-axis-ordering-002.html.ini       |  4 ++++
 .../grid-inline-z-axis-ordering-003.html.ini       |  4 ++++
 .../grid-inline-z-axis-ordering-004.html.ini       |  4 ++++
 .../grid-inline-z-axis-ordering-005.html.ini       |  4 ++++
 ...e-z-axis-ordering-overlapped-items-001.html.ini |  4 ++++
 ...e-z-axis-ordering-overlapped-items-002.html.ini |  4 ++++
 ...e-z-axis-ordering-overlapped-items-003.html.ini |  4 ++++
 ...e-z-axis-ordering-overlapped-items-004.html.ini |  4 ++++
 ...e-z-axis-ordering-overlapped-items-005.html.ini |  4 ++++
 ...e-z-axis-ordering-overlapped-items-006.html.ini |  4 ++++
 .../css-grid/grid-items/grid-items-001.html.ini    |  4 ++++
 .../css-grid/grid-items/grid-items-002.html.ini    |  4 ++++
 .../css-grid/grid-items/grid-items-003.html.ini    |  4 ++++
 .../grid-minimum-size-grid-items-001.html.ini      |  4 ++++
 .../grid-minimum-size-grid-items-013.html.ini      |  4 ++++
 ...grid-order-property-auto-placement-001.html.ini |  4 ++++
 ...grid-order-property-auto-placement-002.html.ini |  4 ++++
 ...grid-order-property-auto-placement-003.html.ini |  4 ++++
 ...grid-order-property-auto-placement-004.html.ini |  4 ++++
 ...grid-order-property-auto-placement-005.html.ini |  4 ++++
 .../grid-order-property-painting-001.html.ini      |  4 ++++
 .../grid-order-property-painting-002.html.ini      |  4 ++++
 .../grid-order-property-painting-003.html.ini      |  4 ++++
 .../grid-order-property-painting-004.html.ini      |  4 ++++
 .../grid-order-property-painting-005.html.ini      |  4 ++++
 .../grid-items/grid-z-axis-ordering-001.html.ini   |  4 ++++
 .../grid-items/grid-z-axis-ordering-002.html.ini   |  4 ++++
 .../grid-items/grid-z-axis-ordering-003.html.ini   |  4 ++++
 .../grid-items/grid-z-axis-ordering-004.html.ini   |  4 ++++
 .../grid-items/grid-z-axis-ordering-005.html.ini   |  4 ++++
 ...d-z-axis-ordering-overlapped-items-001.html.ini |  4 ++++
 ...d-z-axis-ordering-overlapped-items-002.html.ini |  4 ++++
 ...d-z-axis-ordering-overlapped-items-003.html.ini |  4 ++++
 ...d-z-axis-ordering-overlapped-items-004.html.ini |  4 ++++
 ...d-z-axis-ordering-overlapped-items-005.html.ini |  4 ++++
 ...d-z-axis-ordering-overlapped-items-006.html.ini |  4 ++++
 .../grid-model/grid-display-grid-001.html.ini      |  4 ++++
 .../grid-inline-vertical-align-001.html.ini        |  4 ++++
 .../grid-model/grid-vertical-align-001.html.ini    |  4 ++++
 ...rid-percent-cols-filled-shrinkwrap-001.html.ini |  4 ++++
 ...id-percent-cols-spanned-shrinkwrap-001.html.ini |  4 ++++
 .../css/css-multicol/multicol-basic-001.html.ini   |  3 +++
 .../css/css-multicol/multicol-basic-002.html.ini   |  3 +++
 .../css/css-multicol/multicol-basic-003.html.ini   |  3 +++
 .../css/css-multicol/multicol-basic-004.html.ini   |  3 +++
 .../multicol-block-no-clip-001.xht.ini             |  3 +++
 .../multicol-block-no-clip-002.xht.ini             |  3 +++
 .../css/css-multicol/multicol-clip-001.xht.ini     |  3 +++
 .../css/css-multicol/multicol-clip-002.xht.ini     |  3 +++
 .../css-multicol/multicol-collapsing-001.xht.ini   |  3 +++
 .../css/css-multicol/multicol-columns-001.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-002.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-003.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-004.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-005.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-006.xht.ini  |  3 +++
 .../css/css-multicol/multicol-columns-007.xht.ini  |  3 +++
 .../multicol-columns-invalid-001.xht.ini           |  3 +++
 .../multicol-columns-invalid-002.xht.ini           |  3 +++
 .../multicol-columns-toolong-001.xht.ini           |  3 +++
 .../css-multicol/multicol-containing-001.xht.ini   |  3 +++
 .../css-multicol/multicol-containing-002.xht.ini   |  3 +++
 .../css/css-multicol/multicol-count-001.xht.ini    |  3 +++
 .../css/css-multicol/multicol-count-002.xht.ini    |  3 +++
 .../multicol-count-computed-003.xht.ini            |  3 +++
 .../multicol-count-computed-004.xht.ini            |  3 +++
 .../multicol-count-computed-005.xht.ini            |  3 +++
 .../multicol-count-negative-001.xht.ini            |  3 +++
 .../multicol-count-negative-002.xht.ini            |  3 +++
 .../multicol-count-non-integer-001.xht.ini         |  3 +++
 .../multicol-count-non-integer-002.xht.ini         |  3 +++
 .../multicol-count-non-integer-003.xht.ini         |  3 +++
 .../css/css-multicol/multicol-fill-000.xht.ini     |  3 +++
 .../css/css-multicol/multicol-fill-001.xht.ini     |  3 +++
 .../css-multicol/multicol-fill-auto-002.xht.ini    |  3 +++
 .../css-multicol/multicol-fill-auto-003.xht.ini    |  3 +++
 .../css-multicol/multicol-fill-balance-001.xht.ini |  3 +++
 .../meta/css/css-multicol/multicol-gap-000.xht.ini |  3 +++
 .../meta/css/css-multicol/multicol-gap-001.xht.ini |  3 +++
 .../meta/css/css-multicol/multicol-gap-002.xht.ini |  3 +++
 .../meta/css/css-multicol/multicol-gap-003.xht.ini |  3 +++
 .../css-multicol/multicol-gap-fraction-001.xht.ini |  3 +++
 .../css-multicol/multicol-gap-large-001.xht.ini    |  3 +++
 .../css-multicol/multicol-gap-large-002.xht.ini    |  3 +++
 .../css-multicol/multicol-gap-negative-001.xht.ini |  3 +++
 .../css/css-multicol/multicol-height-001.xht.ini   |  3 +++
 .../css/css-multicol/multicol-inherit-002.xht.ini  |  3 +++
 .../css/css-multicol/multicol-inherit-003.xht.ini  |  3 +++
 .../css/css-multicol/multicol-margin-001.xht.ini   |  3 +++
 .../css/css-multicol/multicol-margin-002.xht.ini   |  3 +++
 .../css-multicol/multicol-margin-child-001.xht.ini |  3 +++
 .../css/css-multicol/multicol-nested-002.xht.ini   |  3 +++
 .../css/css-multicol/multicol-nested-005.xht.ini   |  3 +++
 .../multicol-nested-margin-001.xht.ini             |  3 +++
 .../multicol-nested-margin-002.xht.ini             |  3 +++
 .../multicol-nested-margin-003.xht.ini             |  3 +++
 .../multicol-nested-margin-004.xht.ini             |  3 +++
 .../multicol-nested-margin-005.xht.ini             |  3 +++
 .../css-multicol/multicol-overflowing-001.xht.ini  |  3 +++
 .../css/css-multicol/multicol-reduce-000.xht.ini   |  3 +++
 .../css/css-multicol/multicol-rule-000.xht.ini     |  3 +++
 .../css/css-multicol/multicol-rule-001.xht.ini     |  3 +++
 .../css/css-multicol/multicol-rule-002.xht.ini     |  3 +++
 .../css/css-multicol/multicol-rule-003.xht.ini     |  3 +++
 .../css-multicol/multicol-rule-color-001.xht.ini   |  3 +++
 .../multicol-rule-color-inherit-001.xht.ini        |  3 +++
 .../multicol-rule-color-inherit-002.xht.ini        |  3 +++
 .../css-multicol/multicol-rule-dashed-000.xht.ini  |  3 +++
 .../css-multicol/multicol-rule-dotted-000.xht.ini  |  3 +++
 .../css-multicol/multicol-rule-double-000.xht.ini  |  3 +++
 .../multicol-rule-fraction-001.xht.ini             |  3 +++
 .../multicol-rule-fraction-002.xht.ini             |  3 +++
 .../multicol-rule-fraction-003.xht.ini             |  3 +++
 .../css-multicol/multicol-rule-groove-000.xht.ini  |  3 +++
 .../css-multicol/multicol-rule-inset-000.xht.ini   |  3 +++
 .../css-multicol/multicol-rule-large-001.xht.ini   |  3 +++
 .../css-multicol/multicol-rule-outset-000.xht.ini  |  3 +++
 .../css-multicol/multicol-rule-percent-001.xht.ini |  3 +++
 .../css/css-multicol/multicol-rule-px-001.xht.ini  |  3 +++
 .../css-multicol/multicol-rule-ridge-000.xht.ini   |  3 +++
 .../css-multicol/multicol-rule-shorthand-2.xht.ini |  3 +++
 .../css-multicol/multicol-rule-solid-000.xht.ini   |  3 +++
 .../multicol-rule-stacking-001.xht.ini             |  3 +++
 .../css-multicol/multicol-shorthand-001.xht.ini    |  3 +++
 .../css-multicol/multicol-span-none-001.xht.ini    |  3 +++
 .../css/css-multicol/multicol-width-001.xht.ini    |  3 +++
 .../css/css-multicol/multicol-width-002.xht.ini    |  3 +++
 .../css-multicol/multicol-width-count-001.xht.ini  |  3 +++
 .../css-multicol/multicol-width-count-002.xht.ini  |  3 +++
 .../multicol-width-invalid-001.xht.ini             |  3 +++
 .../css-multicol/multicol-width-large-001.xht.ini  |  3 +++
 .../css-multicol/multicol-width-large-002.xht.ini  |  3 +++
 .../multicol-width-negative-001.xht.ini            |  3 +++
 .../css-position/position-sticky-inline.html.ini   |  3 +++
 .../position-sticky-nested-inline.html.ini         |  3 +++
 .../css-pseudo/marker-inherit-line-height.html.ini |  1 -
 .../resizing/regions-resizing-002.html.ini         |  4 ++++
 .../resizing/regions-resizing-004.html.ini         |  4 ++++
 .../shape-box/shape-outside-box-002.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-003.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-004.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-006.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-007.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-008.html.ini       |  4 ++++
 .../shape-box/shape-outside-box-009.html.ini       |  4 ++++
 .../shape-image/shape-image-000.html.ini           |  4 ++++
 .../shape-image/shape-image-001.html.ini           |  4 ++++
 .../shape-image/shape-image-002.html.ini           |  4 ++++
 .../shape-image/shape-image-003.html.ini           |  4 ++++
 .../shape-image/shape-image-004.html.ini           |  4 ++++
 .../shape-image/shape-image-005.html.ini           |  4 ++++
 .../shape-image/shape-image-006.html.ini           |  4 ++++
 .../shape-image/shape-image-007.html.ini           |  4 ++++
 .../shape-image/shape-image-008.html.ini           |  4 ++++
 .../shape-image/shape-image-009.html.ini           |  4 ++++
 .../shape-image/shape-image-010.html.ini           |  4 ++++
 .../shape-image/shape-image-011.html.ini           |  4 ++++
 .../shape-image/shape-image-012.html.ini           |  4 ++++
 .../shape-image/shape-image-013.html.ini           |  4 ++++
 .../shape-image/shape-image-014.html.ini           |  4 ++++
 .../shape-image/shape-image-015.html.ini           |  4 ++++
 .../shape-image/shape-image-016.html.ini           |  4 ++++
 .../shape-image/shape-image-017.html.ini           |  4 ++++
 .../shape-image/shape-image-018.html.ini           |  4 ++++
 .../shape-image/shape-image-019.html.ini           |  4 ++++
 .../shape-image/shape-image-020.html.ini           |  4 ++++
 .../shape-image/shape-image-021.html.ini           |  4 ++++
 .../shape-image/shape-image-022.html.ini           |  4 ++++
 .../shape-image/shape-image-023.html.ini           |  4 ++++
 .../shape-image/shape-image-025.html.ini           |  4 ++++
 .../shape-image/shape-image-026.html.ini           |  4 ++++
 .../shape-image/shape-image-027.html.ini           |  4 ++++
 .../circle/shape-outside-circle-013.html.ini       |  4 ++++
 .../circle/shape-outside-circle-014.html.ini       |  4 ++++
 .../circle/shape-outside-circle-015.html.ini       |  4 ++++
 .../circle/shape-outside-circle-016.html.ini       |  4 ++++
 .../circle/shape-outside-circle-017.html.ini       |  4 ++++
 .../circle/shape-outside-circle-018.html.ini       |  4 ++++
 .../circle/shape-outside-circle-019.html.ini       |  4 ++++
 .../circle/shape-outside-circle-020.html.ini       |  4 ++++
 .../circle/shape-outside-circle-021.html.ini       |  4 ++++
 .../circle/shape-outside-circle-022.html.ini       |  4 ++++
 .../circle/shape-outside-circle-024.html.ini       |  4 ++++
 .../circle/shape-outside-circle-025.html.ini       |  4 ++++
 .../circle/shape-outside-circle-026.html.ini       |  4 ++++
 .../circle/shape-outside-circle-027.html.ini       |  4 ++++
 .../circle/shape-outside-circle-028.html.ini       |  4 ++++
 .../circle/shape-outside-circle-029.html.ini       |  4 ++++
 .../ellipse/shape-outside-ellipse-013.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-014.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-015.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-016.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-017.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-018.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-019.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-020.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-021.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-022.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-023.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-024.html.ini     |  4 ++++
 .../ellipse/shape-outside-ellipse-025.html.ini     |  4 ++++
 .../inset/shape-outside-inset-010.html.ini         |  4 ++++
 .../inset/shape-outside-inset-011.html.ini         |  4 ++++
 .../inset/shape-outside-inset-012.html.ini         |  4 ++++
 .../inset/shape-outside-inset-013.html.ini         |  4 ++++
 .../inset/shape-outside-inset-014.html.ini         |  4 ++++
 .../inset/shape-outside-inset-015.html.ini         |  4 ++++
 .../inset/shape-outside-inset-028.html.ini         |  4 ++++
 .../inset/shape-outside-inset-029.html.ini         |  4 ++++
 .../inset/shape-outside-inset-030.html.ini         |  4 ++++
 .../polygon/shape-outside-polygon-007.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-008.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-009.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-010.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-011.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-012.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-013.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-014.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-015.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-016.html.ini     |  4 ++++
 .../polygon/shape-outside-polygon-017.html.ini     |  4 ++++
 .../spec-examples/shape-outside-001.html.ini       |  4 ++++
 .../spec-examples/shape-outside-002.html.ini       |  4 ++++
 .../spec-examples/shape-outside-003.html.ini       |  4 ++++
 .../spec-examples/shape-outside-005.html.ini       |  4 ++++
 .../spec-examples/shape-outside-006.html.ini       |  4 ++++
 .../spec-examples/shape-outside-007.html.ini       |  4 ++++
 .../intrinsic-percent-non-replaced-001.html.ini    |  3 +++
 .../intrinsic-percent-non-replaced-003.html.ini    |  3 +++
 .../line-breaking/line-breaking-001.html.ini       |  4 ++++
 .../line-breaking/line-breaking-002.html.ini       |  4 ++++
 .../line-breaking/line-breaking-003.html.ini       |  4 ++++
 .../line-breaking/line-breaking-004.html.ini       |  4 ++++
 .../line-breaking/line-breaking-005.html.ini       |  4 ++++
 .../line-breaking/line-breaking-006.html.ini       |  4 ++++
 .../line-breaking/line-breaking-007.html.ini       |  4 ++++
 .../line-breaking/line-breaking-008.html.ini       |  4 ++++
 .../line-breaking/line-breaking-009.html.ini       |  4 ++++
 .../line-breaking/line-breaking-010.html.ini       |  4 ++++
 .../line-breaking/line-breaking-011.html.ini       |  4 ++++
 .../line-breaking/line-breaking-012.html.ini       |  4 ++++
 .../overflow-wrap/overflow-wrap-001.html.ini       |  3 +++
 .../overflow-wrap/overflow-wrap-002.html.ini       |  3 +++
 .../overflow-wrap/overflow-wrap-003.html.ini       |  3 +++
 .../overflow-wrap/overflow-wrap-005.html.ini       |  3 +++
 .../css-text/overflow-wrap/word-wrap-001.html.ini  |  3 +++
 .../css-text/overflow-wrap/word-wrap-002.html.ini  |  3 +++
 .../css-text/overflow-wrap/word-wrap-003.html.ini  |  3 +++
 .../css-text/overflow-wrap/word-wrap-005.html.ini  |  3 +++
 .../css-text/white-space/break-spaces-002.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-001.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-002.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-003.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-004.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-005.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-006.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-007.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-011.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-012.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-013.html.ini |  4 ++++
 .../css/css-text/white-space/pre-wrap-014.html.ini |  4 ++++
 .../white-space/textarea-break-spaces-002.html.ini |  4 ++++
 .../white-space/textarea-pre-wrap-001.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-002.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-003.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-004.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-005.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-006.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-007.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-011.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-012.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-013.html.ini     |  4 ++++
 .../white-space/textarea-pre-wrap-014.html.ini     |  4 ++++
 .../transform-applies-to-002.xht.ini               |  3 +++
 .../meta/css/css-ui/outline-004.html.ini           |  4 ++++
 .../meta/css/css-ui/text-overflow-001.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-002.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-003.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-004.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-007.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-010.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-011.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-013.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-014.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-015.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-016.html.ini     |  4 ++++
 .../meta/css/css-ui/text-overflow-020.html.ini     |  4 ++++
 .../css-variables/vars-font-shorthand-001.html.ini |  4 ++++
 .../abs-pos-non-replaced-vlr-003.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-005.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-009.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-011.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-015.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-017.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-021.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-023.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-027.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-029.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-033.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-035.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-039.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-041.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-045.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-047.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-051.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-053.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-057.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-059.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-063.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-065.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-069.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-071.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-075.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-077.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-081.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-083.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-087.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-089.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-093.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-095.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-103.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-105.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-109.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-111.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-113.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-117.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-119.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-121.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-125.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-127.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-129.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-133.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-135.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-137.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-141.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-143.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-145.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-149.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-151.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-153.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-157.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-159.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-161.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-165.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-167.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-169.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-173.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-175.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-177.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-181.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-183.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-185.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-189.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-191.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-193.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-197.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-199.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-201.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-205.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-207.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-209.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-213.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-215.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-217.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-221.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-223.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-225.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vlr-229.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-002.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-004.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-008.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-010.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-014.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-016.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-020.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-022.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-026.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-028.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-032.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-034.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-038.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-040.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-044.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-046.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-050.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-052.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-056.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-058.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-062.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-064.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-068.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-070.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-074.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-076.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-080.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-082.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-086.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-088.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-092.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-094.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-102.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-104.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-108.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-110.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-112.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-116.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-118.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-120.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-124.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-126.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-128.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-132.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-134.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-136.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-140.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-142.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-144.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-148.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-150.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-152.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-156.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-158.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-160.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-164.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-166.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-168.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-172.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-174.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-176.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-180.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-182.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-184.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-188.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-190.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-192.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-196.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-198.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-200.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-204.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-206.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-208.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-212.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-214.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-216.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-220.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-222.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-224.xht.ini           |  4 ++++
 .../abs-pos-non-replaced-vrl-228.xht.ini           |  4 ++++
 .../block-flow-direction-004.xht.ini               |  4 ++++
 .../block-flow-direction-htb-001.xht.ini           |  4 ++++
 .../block-flow-direction-slr-043.xht.ini           |  4 ++++
 .../block-flow-direction-slr-047.xht.ini           |  4 ++++
 .../block-flow-direction-slr-048.xht.ini           |  4 ++++
 .../block-flow-direction-slr-050.xht.ini           |  4 ++++
 .../block-flow-direction-slr-054.xht.ini           |  4 ++++
 .../block-flow-direction-slr-055.xht.ini           |  4 ++++
 .../block-flow-direction-slr-056.xht.ini           |  4 ++++
 .../block-flow-direction-slr-060.xht.ini           |  4 ++++
 .../block-flow-direction-slr-062.xht.ini           |  4 ++++
 .../block-flow-direction-slr-063.xht.ini           |  4 ++++
 .../block-flow-direction-srl-042.xht.ini           |  4 ++++
 .../block-flow-direction-srl-045.xht.ini           |  4 ++++
 .../block-flow-direction-srl-046.xht.ini           |  4 ++++
 .../block-flow-direction-srl-049.xht.ini           |  4 ++++
 .../block-flow-direction-srl-051.xht.ini           |  4 ++++
 .../block-flow-direction-srl-052.xht.ini           |  4 ++++
 .../block-flow-direction-srl-053.xht.ini           |  4 ++++
 .../block-flow-direction-srl-059.xht.ini           |  4 ++++
 .../block-flow-direction-srl-061.xht.ini           |  4 ++++
 .../block-flow-direction-srl-064.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-003.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-007.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-008.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-010.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-014.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-015.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-016.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-020.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-022.xht.ini           |  4 ++++
 .../block-flow-direction-vlr-023.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-002.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-005.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-006.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-009.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-011.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-012.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-013.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-019.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-021.xht.ini           |  4 ++++
 .../block-flow-direction-vrl-024.xht.ini           |  4 ++++
 .../central-baseline-alignment-002.xht.ini         |  4 ++++
 .../central-baseline-alignment-003.xht.ini         |  4 ++++
 .../float-contiguous-vlr-013.xht.ini               |  4 ++++
 .../float-contiguous-vrl-012.xht.ini               |  4 ++++
 ...eight-width-inline-non-replaced-vlr-003.xht.ini | 14 --------------
 ...eight-width-inline-non-replaced-vrl-002.xht.ini | 14 --------------
 ...line-block-alignment-orthogonal-vlr-003.xht.ini |  4 ++++
 ...line-block-alignment-orthogonal-vlr-005.xht.ini |  4 ++++
 ...line-block-alignment-orthogonal-vrl-002.xht.ini |  4 ++++
 ...line-block-alignment-orthogonal-vrl-004.xht.ini |  4 ++++
 .../line-box-direction-htb-001.xht.ini             |  4 ++++
 .../line-box-direction-slr-043.xht.ini             |  4 ++++
 .../line-box-direction-slr-047.xht.ini             |  4 ++++
 .../line-box-direction-slr-048.xht.ini             |  4 ++++
 .../line-box-direction-slr-050.xht.ini             |  4 ++++
 .../line-box-direction-slr-053.xht.ini             |  4 ++++
 .../line-box-direction-slr-054.xht.ini             |  4 ++++
 .../line-box-direction-slr-058.xht.ini             |  4 ++++
 .../line-box-direction-slr-060.xht.ini             |  4 ++++
 .../line-box-direction-srl-042.xht.ini             |  4 ++++
 .../line-box-direction-srl-045.xht.ini             |  4 ++++
 .../line-box-direction-srl-046.xht.ini             |  4 ++++
 .../line-box-direction-srl-049.xht.ini             |  4 ++++
 .../line-box-direction-srl-051.xht.ini             |  4 ++++
 .../line-box-direction-srl-052.xht.ini             |  4 ++++
 .../line-box-direction-srl-057.xht.ini             |  4 ++++
 .../line-box-direction-srl-059.xht.ini             |  4 ++++
 .../line-box-direction-vlr-003.xht.ini             |  4 ++++
 .../line-box-direction-vlr-007.xht.ini             |  4 ++++
 .../line-box-direction-vlr-008.xht.ini             |  4 ++++
 .../line-box-direction-vlr-010.xht.ini             |  4 ++++
 .../line-box-direction-vlr-013.xht.ini             |  4 ++++
 .../line-box-direction-vlr-014.xht.ini             |  4 ++++
 .../line-box-direction-vlr-018.xht.ini             |  4 ++++
 .../line-box-direction-vlr-020.xht.ini             |  4 ++++
 .../line-box-direction-vrl-002.xht.ini             |  4 ++++
 .../line-box-direction-vrl-005.xht.ini             |  4 ++++
 .../line-box-direction-vrl-006.xht.ini             |  4 ++++
 .../line-box-direction-vrl-009.xht.ini             |  4 ++++
 .../line-box-direction-vrl-011.xht.ini             |  4 ++++
 .../line-box-direction-vrl-012.xht.ini             |  4 ++++
 .../line-box-direction-vrl-017.xht.ini             |  4 ++++
 .../line-box-direction-vrl-019.xht.ini             |  4 ++++
 .../row-progression-slr-023.xht.ini                |  4 ++++
 .../row-progression-slr-029.xht.ini                |  4 ++++
 .../row-progression-srl-022.xht.ini                |  4 ++++
 .../row-progression-srl-028.xht.ini                |  4 ++++
 .../row-progression-vlr-003.xht.ini                |  4 ++++
 .../row-progression-vlr-005.xht.ini                |  4 ++++
 .../row-progression-vlr-007.xht.ini                |  4 ++++
 .../row-progression-vlr-009.xht.ini                |  4 ++++
 .../row-progression-vrl-002.xht.ini                |  4 ++++
 .../row-progression-vrl-004.xht.ini                |  4 ++++
 .../row-progression-vrl-006.xht.ini                |  4 ++++
 .../row-progression-vrl-008.xht.ini                |  4 ++++
 .../table-column-order-002.xht.ini                 |  4 ++++
 .../table-column-order-003.xht.ini                 |  4 ++++
 .../table-column-order-004.xht.ini                 |  4 ++++
 .../table-column-order-005.xht.ini                 |  4 ++++
 .../table-column-order-slr-007.xht.ini             |  4 ++++
 .../table-column-order-srl-006.xht.ini             |  4 ++++
 .../text-baseline-vlr-005.xht.ini                  |  4 ++++
 .../text-baseline-vrl-004.xht.ini                  |  4 ++++
 .../text-combine-upright-layout-rules-001.html.ini |  4 ++++
 .../css-writing-modes/text-indent-vlr-003.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vlr-005.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vlr-007.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vlr-009.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vlr-015.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vlr-017.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-002.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-004.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-006.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-008.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-014.xht.ini  |  4 ++++
 .../css-writing-modes/text-indent-vrl-016.xht.ini  |  4 ++++
 .../images3/object-position-svg-002e.html.ini      |  4 +---
 1325 files changed, 4727 insertions(+), 369 deletions(-)
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
 create mode 100644 testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
 create mode 100644 testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
 create mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
 create mode 100644 testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
 create mode 100644 testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/outline-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
 create mode 100644 testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
 create mode 100644 testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
 delete mode 100644 testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
 create mode 100644 testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini

diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index 293602a9c4b3..c3a7ddb98449 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -88,7 +88,11 @@ web-platform-tests-reftests:
     description: "Web platform reftest run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(Wr)
-    chunks: 6
+    chunks:
+        by-test-platform:
+            macosx.*: 1
+            default: 6
+
     e10s:
         by-test-platform:
             linux32/debug: both
@@ -112,7 +116,10 @@ web-platform-tests-reftests-headless:
     description: "Web platform reftest headless run"
     suite: web-platform-tests-reftests
     treeherder-symbol: W(WrH)
-    chunks: 6
+    chunks:
+        by-test-platform:
+            macosx.*: 1
+            default: 6
     e10s:
         by-test-platform:
             linux32/debug: both
diff --git a/testing/mozharness/scripts/web_platform_tests.py b/testing/mozharness/scripts/web_platform_tests.py
index dfac8debefe6..292f6b4b7fa5 100755
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -230,6 +230,9 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
             cmd += ["--device-serial=%s" % self.device_serial]
             cmd += ["--package-name=%s" % self.query_package_name()]
 
+        if sys.platform == "darwin":
+            cmd += ["--exclude=css"]
+
         if mozinfo.info["os"] == "win" and mozinfo.info["os_version"] == "6.1":
             # On Windows 7 --install-fonts fails, so fall back to a Firefox-specific codepath
             self._install_fonts()
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
new file mode 100644
index 000000000000..2aea7af73763
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-049.xht.ini
@@ -0,0 +1,4 @@
+[background-color-049.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
new file mode 100644
index 000000000000..e9d714dc6786
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-052.xht.ini
@@ -0,0 +1,4 @@
+[background-color-052.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
new file mode 100644
index 000000000000..538213da1219
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-053.xht.ini
@@ -0,0 +1,4 @@
+[background-color-053.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
new file mode 100644
index 000000000000..405a71419cde
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-054.xht.ini
@@ -0,0 +1,4 @@
+[background-color-054.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
new file mode 100644
index 000000000000..2316df8a6137
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-070.xht.ini
@@ -0,0 +1,4 @@
+[background-color-070.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
new file mode 100644
index 000000000000..9c1318a7cfbf
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-073.xht.ini
@@ -0,0 +1,4 @@
+[background-color-073.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
new file mode 100644
index 000000000000..01ed73b7e8e7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-074.xht.ini
@@ -0,0 +1,4 @@
+[background-color-074.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
new file mode 100644
index 000000000000..c6b80037dd86
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-075.xht.ini
@@ -0,0 +1,4 @@
+[background-color-075.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
new file mode 100644
index 000000000000..407bc7e548d7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-090.xht.ini
@@ -0,0 +1,4 @@
+[background-color-090.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
new file mode 100644
index 000000000000..218df150e795
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-093.xht.ini
@@ -0,0 +1,4 @@
+[background-color-093.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
new file mode 100644
index 000000000000..63a60e5670f3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-094.xht.ini
@@ -0,0 +1,4 @@
+[background-color-094.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
new file mode 100644
index 000000000000..1d140577f7f9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-095.xht.ini
@@ -0,0 +1,4 @@
+[background-color-095.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
new file mode 100644
index 000000000000..c14f9a84b669
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-110.xht.ini
@@ -0,0 +1,4 @@
+[background-color-110.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
new file mode 100644
index 000000000000..e77d20f3e462
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-113.xht.ini
@@ -0,0 +1,4 @@
+[background-color-113.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
new file mode 100644
index 000000000000..fbd3d3b362d7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-114.xht.ini
@@ -0,0 +1,4 @@
+[background-color-114.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
new file mode 100644
index 000000000000..370b59f4c7a0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/backgrounds/background-color-115.xht.ini
@@ -0,0 +1,4 @@
+[background-color-115.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
new file mode 100644
index 000000000000..95cf59919bfc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-010.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-010.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
new file mode 100644
index 000000000000..c10618260856
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-011.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
new file mode 100644
index 000000000000..82eb271d4206
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-012.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
new file mode 100644
index 000000000000..7ccca5537b4f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-013.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
new file mode 100644
index 000000000000..160ad88e5574
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-014.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
new file mode 100644
index 000000000000..913ed94f61f3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-015.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
new file mode 100644
index 000000000000..986e3240df84
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-016.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
new file mode 100644
index 000000000000..c159e7040a4c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-017.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
new file mode 100644
index 000000000000..b83f13aebb4c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-018.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-018.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
new file mode 100644
index 000000000000..69a1c1b63e0a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-019.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
new file mode 100644
index 000000000000..68dac964fdab
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-020.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
new file mode 100644
index 000000000000..773f75f7ba74
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-021.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-021.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
new file mode 100644
index 000000000000..f0ca5ad11f2a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-022.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-022.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
new file mode 100644
index 000000000000..daf9f2408b58
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-023.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-023.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
new file mode 100644
index 000000000000..5fc6d7f4e5e0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-024.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-024.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
new file mode 100644
index 000000000000..e996ea78bc2b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-025.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-025.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
new file mode 100644
index 000000000000..e674c5a25d1c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-026.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-026.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
new file mode 100644
index 000000000000..cc3b13fcb27f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-027.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-027.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
new file mode 100644
index 000000000000..f427a9dbefe2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-028.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-028.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
new file mode 100644
index 000000000000..c48042c2cb5b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-029.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-029.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
new file mode 100644
index 000000000000..bf6ec4489582
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-030.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-030.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
new file mode 100644
index 000000000000..be6938044014
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-031.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-031.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
new file mode 100644
index 000000000000..b2c08c247410
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-032.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-032.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
new file mode 100644
index 000000000000..4fc26b07f487
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-033.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-033.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
new file mode 100644
index 000000000000..f6e41cc72929
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-034.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-034.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
new file mode 100644
index 000000000000..116ed583c4e9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-035.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-035.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
new file mode 100644
index 000000000000..bdd82a14e9fe
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-036.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-036.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
new file mode 100644
index 000000000000..70cb1d79980d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-037.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-037.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
new file mode 100644
index 000000000000..686c4668f6b8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-038.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-038.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
new file mode 100644
index 000000000000..9e3b9f65b581
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-039.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-039.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
new file mode 100644
index 000000000000..30420944b323
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-040.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-040.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
new file mode 100644
index 000000000000..247bfc0cd4ee
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-041.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-041.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
new file mode 100644
index 000000000000..c6dc8c497951
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-042.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-042.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
new file mode 100644
index 000000000000..56f63d8c8d8d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-043.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-043.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
new file mode 100644
index 000000000000..37e9674c827e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-044.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-044.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
new file mode 100644
index 000000000000..e4465a365ee7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/bidi-box-model-045.xht.ini
@@ -0,0 +1,4 @@
+[bidi-box-model-045.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
new file mode 100644
index 000000000000..65503e092586
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-001.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
new file mode 100644
index 000000000000..50c9a81d252d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-002.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
new file mode 100644
index 000000000000..d4264cde87b2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-003.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
new file mode 100644
index 000000000000..25b783767078
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-004.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
new file mode 100644
index 000000000000..1159f6ae42ec
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-005.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
new file mode 100644
index 000000000000..fa188700353b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-006.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
new file mode 100644
index 000000000000..a0e8c0449bd7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-007.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
new file mode 100644
index 000000000000..c8de0062515d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-009.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
new file mode 100644
index 000000000000..393a65f5a3a4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-012.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
new file mode 100644
index 000000000000..00df8349decc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-013.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
new file mode 100644
index 000000000000..8c06138fa8f5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-014.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
new file mode 100644
index 000000000000..e0ede6e39846
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/direction-applies-to-015.xht.ini
@@ -0,0 +1,4 @@
+[direction-applies-to-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
new file mode 100644
index 000000000000..ab534971ba52
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-001.xht.ini
@@ -0,0 +1,4 @@
+[line-breaking-bidi-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
new file mode 100644
index 000000000000..4e64a816b073
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-002.xht.ini
@@ -0,0 +1,4 @@
+[line-breaking-bidi-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
new file mode 100644
index 000000000000..b49585b95914
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/bidi-text/line-breaking-bidi-003.xht.ini
@@ -0,0 +1,4 @@
+[line-breaking-bidi-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
new file mode 100644
index 000000000000..491e774b686f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-001.xht.ini
@@ -0,0 +1,4 @@
+[border-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
new file mode 100644
index 000000000000..30b6d95ada5d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-003.xht.ini
@@ -0,0 +1,4 @@
+[border-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
new file mode 100644
index 000000000000..621a0a7be756
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-080.xht.ini
@@ -0,0 +1,4 @@
+[border-bottom-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
new file mode 100644
index 000000000000..82065b5e559c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-083.xht.ini
@@ -0,0 +1,4 @@
+[border-bottom-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
new file mode 100644
index 000000000000..d3833fba4302
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-bottom-width-084.xht.ini
@@ -0,0 +1,4 @@
+[border-bottom-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
new file mode 100644
index 000000000000..d67aaaa1a164
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-left-width-080.xht.ini
@@ -0,0 +1,4 @@
+[border-left-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
new file mode 100644
index 000000000000..70e17e746fda
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-left-width-083.xht.ini
@@ -0,0 +1,4 @@
+[border-left-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
new file mode 100644
index 000000000000..e32593e8b6cb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-left-width-084.xht.ini
@@ -0,0 +1,4 @@
+[border-left-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
new file mode 100644
index 000000000000..8d261622d2bd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-right-width-080.xht.ini
@@ -0,0 +1,4 @@
+[border-right-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
new file mode 100644
index 000000000000..ff133579249b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-right-width-083.xht.ini
@@ -0,0 +1,4 @@
+[border-right-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
new file mode 100644
index 000000000000..676aea56c3e7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-right-width-084.xht.ini
@@ -0,0 +1,4 @@
+[border-right-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
new file mode 100644
index 000000000000..a9232d76d9a1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-top-width-080.xht.ini
@@ -0,0 +1,4 @@
+[border-top-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
new file mode 100644
index 000000000000..3c6c3998c9ff
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-top-width-083.xht.ini
@@ -0,0 +1,4 @@
+[border-top-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
new file mode 100644
index 000000000000..7e66134620a4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-top-width-084.xht.ini
@@ -0,0 +1,4 @@
+[border-top-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
new file mode 100644
index 000000000000..fe746247bfee
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/borders/border-width-applies-to-008.xht.ini
@@ -0,0 +1,4 @@
+[border-width-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
new file mode 100644
index 000000000000..51fab0f75fea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/box-display/anonymous-boxes-inheritance-001.xht.ini
@@ -0,0 +1,4 @@
+[anonymous-boxes-inheritance-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
new file mode 100644
index 000000000000..2867ce578e12
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/box-display/block-in-inline-relpos-001.xht.ini
@@ -0,0 +1,4 @@
+[block-in-inline-relpos-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini b/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
new file mode 100644
index 000000000000..ab612bc846c9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/box-display/display-change-001.xht.ini
@@ -0,0 +1,4 @@
+[display-change-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
new file mode 100644
index 000000000000..79250f38fd48
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-001.xht.ini
@@ -0,0 +1,3 @@
+[color-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
new file mode 100644
index 000000000000..3837a96cef40
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-002.xht.ini
@@ -0,0 +1,3 @@
+[color-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
new file mode 100644
index 000000000000..67b00f22d29b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-003.xht.ini
@@ -0,0 +1,3 @@
+[color-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
new file mode 100644
index 000000000000..5ac7aaad39ae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-004.xht.ini
@@ -0,0 +1,3 @@
+[color-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
new file mode 100644
index 000000000000..32c19d538409
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-005.xht.ini
@@ -0,0 +1,3 @@
+[color-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
new file mode 100644
index 000000000000..102e2e65e03b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-006.xht.ini
@@ -0,0 +1,3 @@
+[color-006.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
new file mode 100644
index 000000000000..b7cd4ed6fb9d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-007.xht.ini
@@ -0,0 +1,3 @@
+[color-007.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
new file mode 100644
index 000000000000..fd5982bfd0f2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-008.xht.ini
@@ -0,0 +1,3 @@
+[color-008.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
new file mode 100644
index 000000000000..5ea40e3051c3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-009.xht.ini
@@ -0,0 +1,3 @@
+[color-009.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
new file mode 100644
index 000000000000..f0d7ff205bd0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-010.xht.ini
@@ -0,0 +1,3 @@
+[color-010.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
new file mode 100644
index 000000000000..5bccc43b1895
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-011.xht.ini
@@ -0,0 +1,3 @@
+[color-011.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
new file mode 100644
index 000000000000..1c5443a73d43
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-012.xht.ini
@@ -0,0 +1,3 @@
+[color-012.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
new file mode 100644
index 000000000000..55c1e5d27eac
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-013.xht.ini
@@ -0,0 +1,3 @@
+[color-013.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
new file mode 100644
index 000000000000..a9f07e204c13
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-014.xht.ini
@@ -0,0 +1,3 @@
+[color-014.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
new file mode 100644
index 000000000000..abb2535b7c75
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-015.xht.ini
@@ -0,0 +1,3 @@
+[color-015.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
new file mode 100644
index 000000000000..32881148b294
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-016.xht.ini
@@ -0,0 +1,3 @@
+[color-016.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
new file mode 100644
index 000000000000..d2b39f415e54
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-017.xht.ini
@@ -0,0 +1,3 @@
+[color-017.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
new file mode 100644
index 000000000000..ffc35397e4f2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-018.xht.ini
@@ -0,0 +1,3 @@
+[color-018.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
new file mode 100644
index 000000000000..bb24ee56bd50
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-019.xht.ini
@@ -0,0 +1,3 @@
+[color-019.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
new file mode 100644
index 000000000000..fa3d25ac23f9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-020.xht.ini
@@ -0,0 +1,3 @@
+[color-020.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
new file mode 100644
index 000000000000..1e120d0be0f5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-021.xht.ini
@@ -0,0 +1,3 @@
+[color-021.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
new file mode 100644
index 000000000000..7315e5edc31f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-022.xht.ini
@@ -0,0 +1,3 @@
+[color-022.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
new file mode 100644
index 000000000000..e466c5f187c6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-023.xht.ini
@@ -0,0 +1,3 @@
+[color-023.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
new file mode 100644
index 000000000000..dc6645ac0ae8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-024.xht.ini
@@ -0,0 +1,3 @@
+[color-024.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
new file mode 100644
index 000000000000..bc3eaff8233e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-025.xht.ini
@@ -0,0 +1,3 @@
+[color-025.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
new file mode 100644
index 000000000000..68a3750c18bc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-026.xht.ini
@@ -0,0 +1,3 @@
+[color-026.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
new file mode 100644
index 000000000000..3204f8ff9167
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-027.xht.ini
@@ -0,0 +1,3 @@
+[color-027.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
new file mode 100644
index 000000000000..bbf99baa7f42
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-028.xht.ini
@@ -0,0 +1,3 @@
+[color-028.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
new file mode 100644
index 000000000000..3c7fb5609cc3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-029.xht.ini
@@ -0,0 +1,3 @@
+[color-029.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
new file mode 100644
index 000000000000..245a045002d1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-031.xht.ini
@@ -0,0 +1,3 @@
+[color-031.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
new file mode 100644
index 000000000000..45481250bd41
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-032.xht.ini
@@ -0,0 +1,3 @@
+[color-032.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
new file mode 100644
index 000000000000..cb4fb140646e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-033.xht.ini
@@ -0,0 +1,3 @@
+[color-033.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
new file mode 100644
index 000000000000..18f021d2831b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-034.xht.ini
@@ -0,0 +1,3 @@
+[color-034.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
new file mode 100644
index 000000000000..149605023a88
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-035.xht.ini
@@ -0,0 +1,3 @@
+[color-035.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
new file mode 100644
index 000000000000..ba97180d82c7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-036.xht.ini
@@ -0,0 +1,3 @@
+[color-036.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
new file mode 100644
index 000000000000..76e7b3f2f8a6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-037.xht.ini
@@ -0,0 +1,3 @@
+[color-037.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
new file mode 100644
index 000000000000..d066139eb149
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-038.xht.ini
@@ -0,0 +1,3 @@
+[color-038.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
new file mode 100644
index 000000000000..c0c1a556b31f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-039.xht.ini
@@ -0,0 +1,3 @@
+[color-039.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
new file mode 100644
index 000000000000..96c1e927f204
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-040.xht.ini
@@ -0,0 +1,3 @@
+[color-040.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
new file mode 100644
index 000000000000..c6d938de42a4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-041.xht.ini
@@ -0,0 +1,3 @@
+[color-041.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
new file mode 100644
index 000000000000..dbe988c7e151
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-042.xht.ini
@@ -0,0 +1,3 @@
+[color-042.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
new file mode 100644
index 000000000000..cfbad3e9f9f4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-043.xht.ini
@@ -0,0 +1,3 @@
+[color-043.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
new file mode 100644
index 000000000000..52cb17e16314
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-044.xht.ini
@@ -0,0 +1,3 @@
+[color-044.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
new file mode 100644
index 000000000000..99acf7ea9a62
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-045.xht.ini
@@ -0,0 +1,3 @@
+[color-045.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
new file mode 100644
index 000000000000..ed30de153289
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-046.xht.ini
@@ -0,0 +1,3 @@
+[color-046.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
new file mode 100644
index 000000000000..1eb31700f836
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-047.xht.ini
@@ -0,0 +1,3 @@
+[color-047.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
new file mode 100644
index 000000000000..76581079fbe1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-048.xht.ini
@@ -0,0 +1,3 @@
+[color-048.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
new file mode 100644
index 000000000000..3ccbe79d387a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-049.xht.ini
@@ -0,0 +1,3 @@
+[color-049.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
new file mode 100644
index 000000000000..3fbb2c57b525
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-050.xht.ini
@@ -0,0 +1,3 @@
+[color-050.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
new file mode 100644
index 000000000000..31a08b745383
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-051.xht.ini
@@ -0,0 +1,3 @@
+[color-051.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
new file mode 100644
index 000000000000..81c53bdec139
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-052.xht.ini
@@ -0,0 +1,3 @@
+[color-052.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
new file mode 100644
index 000000000000..e5e6cc8446b8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-053.xht.ini
@@ -0,0 +1,3 @@
+[color-053.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
new file mode 100644
index 000000000000..f9e0e37fc614
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-054.xht.ini
@@ -0,0 +1,3 @@
+[color-054.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
new file mode 100644
index 000000000000..ff1b8b8d05ed
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-055.xht.ini
@@ -0,0 +1,3 @@
+[color-055.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
new file mode 100644
index 000000000000..f1bb3d2ffdc4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-056.xht.ini
@@ -0,0 +1,3 @@
+[color-056.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
new file mode 100644
index 000000000000..ba8673de97c0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-057.xht.ini
@@ -0,0 +1,3 @@
+[color-057.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
new file mode 100644
index 000000000000..59551924708c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-058.xht.ini
@@ -0,0 +1,3 @@
+[color-058.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
new file mode 100644
index 000000000000..e4db198735c9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-059.xht.ini
@@ -0,0 +1,3 @@
+[color-059.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
new file mode 100644
index 000000000000..5a4ce0ff3376
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-060.xht.ini
@@ -0,0 +1,3 @@
+[color-060.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
new file mode 100644
index 000000000000..6621a90a73ad
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-061.xht.ini
@@ -0,0 +1,3 @@
+[color-061.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
new file mode 100644
index 000000000000..d10c5075e20a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-062.xht.ini
@@ -0,0 +1,3 @@
+[color-062.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
new file mode 100644
index 000000000000..0c9377c1ed7e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-063.xht.ini
@@ -0,0 +1,3 @@
+[color-063.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
new file mode 100644
index 000000000000..8e866cba34f3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-064.xht.ini
@@ -0,0 +1,3 @@
+[color-064.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
new file mode 100644
index 000000000000..f3dc663bbb92
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-065.xht.ini
@@ -0,0 +1,3 @@
+[color-065.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
new file mode 100644
index 000000000000..4d36c923dd56
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-066.xht.ini
@@ -0,0 +1,3 @@
+[color-066.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
new file mode 100644
index 000000000000..25b1bfbf0b3c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-067.xht.ini
@@ -0,0 +1,3 @@
+[color-067.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
new file mode 100644
index 000000000000..d28d8714c844
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-068.xht.ini
@@ -0,0 +1,3 @@
+[color-068.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
new file mode 100644
index 000000000000..90639913c7a9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-069.xht.ini
@@ -0,0 +1,3 @@
+[color-069.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
new file mode 100644
index 000000000000..94f5ceb5da03
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-070.xht.ini
@@ -0,0 +1,3 @@
+[color-070.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
new file mode 100644
index 000000000000..07af904807e5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-071.xht.ini
@@ -0,0 +1,3 @@
+[color-071.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
new file mode 100644
index 000000000000..709e7ed488b8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-072.xht.ini
@@ -0,0 +1,3 @@
+[color-072.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
new file mode 100644
index 000000000000..452fb53c329c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-073.xht.ini
@@ -0,0 +1,3 @@
+[color-073.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
new file mode 100644
index 000000000000..7f95cc74f4a5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-074.xht.ini
@@ -0,0 +1,3 @@
+[color-074.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
new file mode 100644
index 000000000000..e24dd9f5635e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-075.xht.ini
@@ -0,0 +1,3 @@
+[color-075.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
new file mode 100644
index 000000000000..7a2a4c179556
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-076.xht.ini
@@ -0,0 +1,3 @@
+[color-076.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
new file mode 100644
index 000000000000..63f4f4e8b468
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-077.xht.ini
@@ -0,0 +1,3 @@
+[color-077.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
new file mode 100644
index 000000000000..38e1f6919d44
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-078.xht.ini
@@ -0,0 +1,3 @@
+[color-078.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
new file mode 100644
index 000000000000..89957ca021b6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-079.xht.ini
@@ -0,0 +1,3 @@
+[color-079.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
new file mode 100644
index 000000000000..2c01adb567ed
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-080.xht.ini
@@ -0,0 +1,3 @@
+[color-080.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
new file mode 100644
index 000000000000..dba222a7fe72
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-081.xht.ini
@@ -0,0 +1,3 @@
+[color-081.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
new file mode 100644
index 000000000000..9f41424478a7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-082.xht.ini
@@ -0,0 +1,3 @@
+[color-082.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
new file mode 100644
index 000000000000..30e4390b0e33
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-083.xht.ini
@@ -0,0 +1,3 @@
+[color-083.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
new file mode 100644
index 000000000000..fb6395342154
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-084.xht.ini
@@ -0,0 +1,3 @@
+[color-084.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
new file mode 100644
index 000000000000..2a3073e8aca0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-085.xht.ini
@@ -0,0 +1,3 @@
+[color-085.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
new file mode 100644
index 000000000000..2d2a22147322
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-086.xht.ini
@@ -0,0 +1,3 @@
+[color-086.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
new file mode 100644
index 000000000000..8ea36f64af07
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-087.xht.ini
@@ -0,0 +1,3 @@
+[color-087.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
new file mode 100644
index 000000000000..7d9b22351a37
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-088.xht.ini
@@ -0,0 +1,3 @@
+[color-088.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
new file mode 100644
index 000000000000..2b5ac7c58f0c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-089.xht.ini
@@ -0,0 +1,3 @@
+[color-089.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
new file mode 100644
index 000000000000..b557681720b2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-090.xht.ini
@@ -0,0 +1,3 @@
+[color-090.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
new file mode 100644
index 000000000000..12d9ebf1a75b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-091.xht.ini
@@ -0,0 +1,3 @@
+[color-091.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
new file mode 100644
index 000000000000..9608c5b6c3b7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-092.xht.ini
@@ -0,0 +1,3 @@
+[color-092.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
new file mode 100644
index 000000000000..1de991eee393
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-093.xht.ini
@@ -0,0 +1,3 @@
+[color-093.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
new file mode 100644
index 000000000000..6ec56c46ae62
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-094.xht.ini
@@ -0,0 +1,3 @@
+[color-094.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
new file mode 100644
index 000000000000..e38277ace47b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-095.xht.ini
@@ -0,0 +1,3 @@
+[color-095.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
new file mode 100644
index 000000000000..f0cd90d81b8e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-096.xht.ini
@@ -0,0 +1,3 @@
+[color-096.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
new file mode 100644
index 000000000000..cf8291d94aea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-097.xht.ini
@@ -0,0 +1,3 @@
+[color-097.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
new file mode 100644
index 000000000000..47f2528a2ac9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-098.xht.ini
@@ -0,0 +1,3 @@
+[color-098.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
new file mode 100644
index 000000000000..b05187e69577
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-099.xht.ini
@@ -0,0 +1,3 @@
+[color-099.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
new file mode 100644
index 000000000000..7257af87dc30
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-100.xht.ini
@@ -0,0 +1,3 @@
+[color-100.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
new file mode 100644
index 000000000000..b7b1943f1e27
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-101.xht.ini
@@ -0,0 +1,3 @@
+[color-101.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
new file mode 100644
index 000000000000..cee639b065d8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-102.xht.ini
@@ -0,0 +1,3 @@
+[color-102.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
new file mode 100644
index 000000000000..7799f6601fad
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-103.xht.ini
@@ -0,0 +1,3 @@
+[color-103.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
new file mode 100644
index 000000000000..050d7ce485c7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-104.xht.ini
@@ -0,0 +1,3 @@
+[color-104.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
new file mode 100644
index 000000000000..2361cf07f895
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-105.xht.ini
@@ -0,0 +1,3 @@
+[color-105.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
new file mode 100644
index 000000000000..47a26dca3307
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-106.xht.ini
@@ -0,0 +1,3 @@
+[color-106.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
new file mode 100644
index 000000000000..42e68f5425c3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-107.xht.ini
@@ -0,0 +1,3 @@
+[color-107.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
new file mode 100644
index 000000000000..817796d06b40
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-108.xht.ini
@@ -0,0 +1,3 @@
+[color-108.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
new file mode 100644
index 000000000000..b370d28284b2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-109.xht.ini
@@ -0,0 +1,3 @@
+[color-109.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
new file mode 100644
index 000000000000..7cb7d1ace39d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-110.xht.ini
@@ -0,0 +1,3 @@
+[color-110.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
new file mode 100644
index 000000000000..4979eb2a4c00
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-111.xht.ini
@@ -0,0 +1,3 @@
+[color-111.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
new file mode 100644
index 000000000000..f5db4331e890
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-112.xht.ini
@@ -0,0 +1,3 @@
+[color-112.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
new file mode 100644
index 000000000000..48952751d2e8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-113.xht.ini
@@ -0,0 +1,3 @@
+[color-113.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
new file mode 100644
index 000000000000..e0d876d87cf2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-114.xht.ini
@@ -0,0 +1,3 @@
+[color-114.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
new file mode 100644
index 000000000000..9f677a5ac886
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-115.xht.ini
@@ -0,0 +1,3 @@
+[color-115.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
new file mode 100644
index 000000000000..41ff008a55ae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-116.xht.ini
@@ -0,0 +1,3 @@
+[color-116.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
new file mode 100644
index 000000000000..f79c590b51b0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-117.xht.ini
@@ -0,0 +1,3 @@
+[color-117.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
new file mode 100644
index 000000000000..09d468fc9bed
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-118.xht.ini
@@ -0,0 +1,3 @@
+[color-118.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
new file mode 100644
index 000000000000..853a2aa74366
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-119.xht.ini
@@ -0,0 +1,3 @@
+[color-119.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
new file mode 100644
index 000000000000..dc3fcd070049
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-120.xht.ini
@@ -0,0 +1,3 @@
+[color-120.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
new file mode 100644
index 000000000000..8c49a335430e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-121.xht.ini
@@ -0,0 +1,3 @@
+[color-121.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
new file mode 100644
index 000000000000..1eef5c051076
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-122.xht.ini
@@ -0,0 +1,3 @@
+[color-122.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
new file mode 100644
index 000000000000..04ad02418568
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-123.xht.ini
@@ -0,0 +1,3 @@
+[color-123.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
new file mode 100644
index 000000000000..eed9b40c139d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-124.xht.ini
@@ -0,0 +1,3 @@
+[color-124.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
new file mode 100644
index 000000000000..1e686234ed98
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-125.xht.ini
@@ -0,0 +1,3 @@
+[color-125.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
new file mode 100644
index 000000000000..b6546e202b4d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-126.xht.ini
@@ -0,0 +1,3 @@
+[color-126.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
new file mode 100644
index 000000000000..762492a9eb9a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-127.xht.ini
@@ -0,0 +1,3 @@
+[color-127.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
new file mode 100644
index 000000000000..7ebea69f1adc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-128.xht.ini
@@ -0,0 +1,3 @@
+[color-128.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
new file mode 100644
index 000000000000..0c2f9e30e285
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-129.xht.ini
@@ -0,0 +1,3 @@
+[color-129.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
new file mode 100644
index 000000000000..dd862bc09df0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-130.xht.ini
@@ -0,0 +1,3 @@
+[color-130.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
new file mode 100644
index 000000000000..c37e7216c9b1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-131.xht.ini
@@ -0,0 +1,3 @@
+[color-131.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
new file mode 100644
index 000000000000..ab4a77213aa4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-132.xht.ini
@@ -0,0 +1,3 @@
+[color-132.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
new file mode 100644
index 000000000000..40bf25c0a3e1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-133.xht.ini
@@ -0,0 +1,3 @@
+[color-133.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
new file mode 100644
index 000000000000..52aadd53f2ea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-134.xht.ini
@@ -0,0 +1,3 @@
+[color-134.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
new file mode 100644
index 000000000000..1f328e8cd660
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-135.xht.ini
@@ -0,0 +1,3 @@
+[color-135.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
new file mode 100644
index 000000000000..b1f3d4095550
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-136.xht.ini
@@ -0,0 +1,3 @@
+[color-136.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
new file mode 100644
index 000000000000..c1bb7cdf1a63
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-137.xht.ini
@@ -0,0 +1,3 @@
+[color-137.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
new file mode 100644
index 000000000000..7ff9a1ee91ca
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-138.xht.ini
@@ -0,0 +1,3 @@
+[color-138.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
new file mode 100644
index 000000000000..73a4a083c9d2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-139.xht.ini
@@ -0,0 +1,3 @@
+[color-139.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
new file mode 100644
index 000000000000..1f5efbb5db0b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-140.xht.ini
@@ -0,0 +1,3 @@
+[color-140.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
new file mode 100644
index 000000000000..7c2fb7f22553
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-141.xht.ini
@@ -0,0 +1,3 @@
+[color-141.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
new file mode 100644
index 000000000000..46b55016db98
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-142.xht.ini
@@ -0,0 +1,3 @@
+[color-142.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
new file mode 100644
index 000000000000..e0d16e24f27d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-143.xht.ini
@@ -0,0 +1,3 @@
+[color-143.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
new file mode 100644
index 000000000000..fb4f24e1845a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-144.xht.ini
@@ -0,0 +1,3 @@
+[color-144.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
new file mode 100644
index 000000000000..fe23d4a61c5c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-145.xht.ini
@@ -0,0 +1,3 @@
+[color-145.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini b/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
new file mode 100644
index 000000000000..c99912411f8e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/colors/color-174.xht.ini
@@ -0,0 +1,3 @@
+[color-174.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
new file mode 100644
index 000000000000..6e57de9c6190
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c412-blockw-000.xht.ini
@@ -0,0 +1,3 @@
+[c412-blockw-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
new file mode 100644
index 000000000000..78256de92fde
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c412-hz-box-000.xht.ini
@@ -0,0 +1,3 @@
+[c412-hz-box-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
new file mode 100644
index 000000000000..e0bd236d3282
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c42-ibx-ht-000.xht.ini
@@ -0,0 +1,3 @@
+[c42-ibx-ht-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
new file mode 100644
index 000000000000..99ca1352d049
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c43-rpl-bbx-002.xht.ini
@@ -0,0 +1,3 @@
+[c43-rpl-bbx-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
new file mode 100644
index 000000000000..071750b82989
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-000.xht.ini
@@ -0,0 +1,3 @@
+[c44-ln-box-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
new file mode 100644
index 000000000000..0db5341695a0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-001.xht.ini
@@ -0,0 +1,3 @@
+[c44-ln-box-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
new file mode 100644
index 000000000000..0458e23a0d74
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-002.xht.ini
@@ -0,0 +1,3 @@
+[c44-ln-box-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
new file mode 100644
index 000000000000..3c5e280ee564
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c44-ln-box-003.xht.ini
@@ -0,0 +1,3 @@
+[c44-ln-box-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
new file mode 100644
index 000000000000..d3cdd847f8f2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-001.xht.ini
@@ -0,0 +1,3 @@
+[c526-font-sz-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
new file mode 100644
index 000000000000..87381f51bda4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-002.xht.ini
@@ -0,0 +1,3 @@
+[c526-font-sz-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
new file mode 100644
index 000000000000..d2be0d44e265
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c526-font-sz-003.xht.ini
@@ -0,0 +1,3 @@
+[c526-font-sz-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
new file mode 100644
index 000000000000..9ceb04910a43
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-000.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgre-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
new file mode 100644
index 000000000000..4ae8f06cfeec
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgre-001.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgre-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
new file mode 100644
index 000000000000..fb912f02074e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-000.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
new file mode 100644
index 000000000000..70132cb888eb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-001.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
new file mode 100644
index 000000000000..7140d13ff581
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-002.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
new file mode 100644
index 000000000000..c0082139a23a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-003.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
new file mode 100644
index 000000000000..dfe520caa0ba
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-004.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
new file mode 100644
index 000000000000..06957b4a7859
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c534-bgreps-005.xht.ini
@@ -0,0 +1,3 @@
+[c534-bgreps-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
new file mode 100644
index 000000000000..71a86b682dff
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-000.xht.ini
@@ -0,0 +1,3 @@
+[c536-bgpos-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
new file mode 100644
index 000000000000..885eac522da6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c536-bgpos-001.xht.ini
@@ -0,0 +1,3 @@
+[c536-bgpos-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
new file mode 100644
index 000000000000..cf650b57cee6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c541-word-sp-000.xht.ini
@@ -0,0 +1,3 @@
+[c541-word-sp-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
new file mode 100644
index 000000000000..61907e7767e1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-000.xht.ini
@@ -0,0 +1,3 @@
+[c542-letter-sp-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
new file mode 100644
index 000000000000..651a3dba5d56
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c542-letter-sp-001.xht.ini
@@ -0,0 +1,3 @@
+[c542-letter-sp-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
new file mode 100644
index 000000000000..a0ab00a2f152
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c544-valgn-001.xht.ini
@@ -0,0 +1,3 @@
+[c544-valgn-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
new file mode 100644
index 000000000000..126f0b5d0fa4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c547-indent-000.xht.ini
@@ -0,0 +1,3 @@
+[c547-indent-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
new file mode 100644
index 000000000000..341a61d5e8e4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-leadin-000.xht.ini
@@ -0,0 +1,3 @@
+[c548-leadin-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
new file mode 100644
index 000000000000..c1740d60947f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-000.xht.ini
@@ -0,0 +1,3 @@
+[c548-ln-ht-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
new file mode 100644
index 000000000000..6e68a35123d2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-001.xht.ini
@@ -0,0 +1,3 @@
+[c548-ln-ht-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
new file mode 100644
index 000000000000..80fd3fc9279f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-002.xht.ini
@@ -0,0 +1,3 @@
+[c548-ln-ht-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
new file mode 100644
index 000000000000..44a29c17fdbc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-003.xht.ini
@@ -0,0 +1,3 @@
+[c548-ln-ht-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
new file mode 100644
index 000000000000..810f45b08173
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c548-ln-ht-004.xht.ini
@@ -0,0 +1,3 @@
+[c548-ln-ht-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
new file mode 100644
index 000000000000..422fe19c0c3f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5501-imrgn-t-000.xht.ini
@@ -0,0 +1,3 @@
+[c5501-imrgn-t-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
new file mode 100644
index 000000000000..facef1e0595e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5501-mrgn-t-000.xht.ini
@@ -0,0 +1,3 @@
+[c5501-mrgn-t-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
new file mode 100644
index 000000000000..23a5e02c88cc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-000.xht.ini
@@ -0,0 +1,3 @@
+[c5502-imrgn-r-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
new file mode 100644
index 000000000000..bb5c3e0cf4bc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-001.xht.ini
@@ -0,0 +1,3 @@
+[c5502-imrgn-r-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
new file mode 100644
index 000000000000..1eff2eea74a6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-imrgn-r-004.xht.ini
@@ -0,0 +1,3 @@
+[c5502-imrgn-r-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
new file mode 100644
index 000000000000..f20dcaea35fd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-000.xht.ini
@@ -0,0 +1,3 @@
+[c5502-mrgn-r-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
new file mode 100644
index 000000000000..73eefd85257f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5502-mrgn-r-001.xht.ini
@@ -0,0 +1,3 @@
+[c5502-mrgn-r-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
new file mode 100644
index 000000000000..73a66f149cd9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5503-imrgn-b-000.xht.ini
@@ -0,0 +1,3 @@
+[c5503-imrgn-b-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
new file mode 100644
index 000000000000..81d6575e48ea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5503-mrgn-b-000.xht.ini
@@ -0,0 +1,3 @@
+[c5503-mrgn-b-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
new file mode 100644
index 000000000000..7ce09fc35d29
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-000.xht.ini
@@ -0,0 +1,3 @@
+[c5504-imrgn-l-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
new file mode 100644
index 000000000000..54480189ff4f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-001.xht.ini
@@ -0,0 +1,3 @@
+[c5504-imrgn-l-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
new file mode 100644
index 000000000000..ea66767e6a44
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-002.xht.ini
@@ -0,0 +1,3 @@
+[c5504-imrgn-l-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
new file mode 100644
index 000000000000..43222ad9acc0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-imrgn-l-004.xht.ini
@@ -0,0 +1,3 @@
+[c5504-imrgn-l-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
new file mode 100644
index 000000000000..6304d10d189c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-000.xht.ini
@@ -0,0 +1,3 @@
+[c5504-mrgn-l-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
new file mode 100644
index 000000000000..0f1e16d2d834
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5504-mrgn-l-001.xht.ini
@@ -0,0 +1,3 @@
+[c5504-mrgn-l-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
new file mode 100644
index 000000000000..83fcee90c321
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-000.xht.ini
@@ -0,0 +1,3 @@
+[c5505-mrgn-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
new file mode 100644
index 000000000000..d126d15393b3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-001.xht.ini
@@ -0,0 +1,3 @@
+[c5505-mrgn-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
new file mode 100644
index 000000000000..bd245bd34dc6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5505-mrgn-003.xht.ini
@@ -0,0 +1,3 @@
+[c5505-mrgn-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
new file mode 100644
index 000000000000..e358cbbb540a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-000.xht.ini
@@ -0,0 +1,3 @@
+[c5506-ipadn-t-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
new file mode 100644
index 000000000000..851f35544680
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-001.xht.ini
@@ -0,0 +1,3 @@
+[c5506-ipadn-t-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
new file mode 100644
index 000000000000..c19e56fe21a1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5506-ipadn-t-002.xht.ini
@@ -0,0 +1,3 @@
+[c5506-ipadn-t-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
new file mode 100644
index 000000000000..b0ef335e5c20
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5506-padn-t-000.xht.ini
@@ -0,0 +1,3 @@
+[c5506-padn-t-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
new file mode 100644
index 000000000000..46aaa646740c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-000.xht.ini
@@ -0,0 +1,3 @@
+[c5507-ipadn-r-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
new file mode 100644
index 000000000000..85bf88d79402
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-001.xht.ini
@@ -0,0 +1,3 @@
+[c5507-ipadn-r-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
new file mode 100644
index 000000000000..ba2146a3871a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-ipadn-r-002.xht.ini
@@ -0,0 +1,3 @@
+[c5507-ipadn-r-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
new file mode 100644
index 000000000000..1d04c5189f0a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-000.xht.ini
@@ -0,0 +1,3 @@
+[c5507-padn-r-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
new file mode 100644
index 000000000000..ea1af1d9c1ad
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5507-padn-r-001.xht.ini
@@ -0,0 +1,3 @@
+[c5507-padn-r-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
new file mode 100644
index 000000000000..840b0b1b0399
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-000.xht.ini
@@ -0,0 +1,3 @@
+[c5508-ipadn-b-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
new file mode 100644
index 000000000000..9dc8de8d0ba9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-001.xht.ini
@@ -0,0 +1,3 @@
+[c5508-ipadn-b-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
new file mode 100644
index 000000000000..1edc63ed4911
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-002.xht.ini
@@ -0,0 +1,3 @@
+[c5508-ipadn-b-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
new file mode 100644
index 000000000000..01eb147e1467
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5508-ipadn-b-003.xht.ini
@@ -0,0 +1,3 @@
+[c5508-ipadn-b-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
new file mode 100644
index 000000000000..51aff4c23147
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-000.xht.ini
@@ -0,0 +1,3 @@
+[c5509-ipadn-l-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
new file mode 100644
index 000000000000..ded2afd020c7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-001.xht.ini
@@ -0,0 +1,3 @@
+[c5509-ipadn-l-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
new file mode 100644
index 000000000000..e2c4f5b68772
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-ipadn-l-002.xht.ini
@@ -0,0 +1,3 @@
+[c5509-ipadn-l-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
new file mode 100644
index 000000000000..d554135f64ec
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-000.xht.ini
@@ -0,0 +1,3 @@
+[c5509-padn-l-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
new file mode 100644
index 000000000000..a16cc79f5015
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5509-padn-l-001.xht.ini
@@ -0,0 +1,3 @@
+[c5509-padn-l-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
new file mode 100644
index 000000000000..22b6f17e4bae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5510-padn-001.xht.ini
@@ -0,0 +1,3 @@
+[c5510-padn-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
new file mode 100644
index 000000000000..955075dfebf9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5525-fltblck-000.xht.ini
@@ -0,0 +1,3 @@
+[c5525-fltblck-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
new file mode 100644
index 000000000000..0e3e22552132
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5525-fltinln-000.xht.ini
@@ -0,0 +1,3 @@
+[c5525-fltinln-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
new file mode 100644
index 000000000000..168d233da07e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5525-fltmrgn-000.xht.ini
@@ -0,0 +1,3 @@
+[c5525-fltmrgn-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
new file mode 100644
index 000000000000..4f2b21adccd6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c5526-fltclr-000.xht.ini
@@ -0,0 +1,3 @@
+[c5526-fltclr-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
new file mode 100644
index 000000000000..af0580733dbd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c562-white-sp-000.xht.ini
@@ -0,0 +1,3 @@
+[c562-white-sp-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
new file mode 100644
index 000000000000..823a9627b664
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c61-ex-len-000.xht.ini
@@ -0,0 +1,3 @@
+[c61-ex-len-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
new file mode 100644
index 000000000000..4d644e245031
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c61-rel-len-000.xht.ini
@@ -0,0 +1,3 @@
+[c61-rel-len-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini b/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
new file mode 100644
index 000000000000..5f1f5e869d4f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/css1/c62-percent-000.xht.ini
@@ -0,0 +1,3 @@
+[c62-percent-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
new file mode 100644
index 000000000000..7b67e93d74e4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/clear-clearance-calculation-005.xht.ini
@@ -0,0 +1,3 @@
+[clear-clearance-calculation-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
new file mode 100644
index 000000000000..300bae920aa8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-005.xht.ini
@@ -0,0 +1,3 @@
+[float-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
new file mode 100644
index 000000000000..03b34e7ff4a0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-007.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-007.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
new file mode 100644
index 000000000000..d5aff3d4f11e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-008.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-008.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
new file mode 100644
index 000000000000..8f42a42df690
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-009.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-009.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
new file mode 100644
index 000000000000..c5658b867195
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-010.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-010.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
new file mode 100644
index 000000000000..76d2010dd699
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-011.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-011.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
new file mode 100644
index 000000000000..562fe103f870
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/float-non-replaced-width-012.xht.ini
@@ -0,0 +1,3 @@
+[float-non-replaced-width-012.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
new file mode 100644
index 000000000000..f9e7506182e0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-006.xht.ini
@@ -0,0 +1,3 @@
+[floats-006.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
new file mode 100644
index 000000000000..4be8cc0ff042
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-009.xht.ini
@@ -0,0 +1,3 @@
+[floats-009.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
new file mode 100644
index 000000000000..ae4092811b8f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-111.xht.ini
@@ -0,0 +1,3 @@
+[floats-111.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
new file mode 100644
index 000000000000..e5a4632eea4b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-112.xht.ini
@@ -0,0 +1,3 @@
+[floats-112.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
new file mode 100644
index 000000000000..71b607cee83c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-113.xht.ini
@@ -0,0 +1,3 @@
+[floats-113.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
new file mode 100644
index 000000000000..ebdd99ea2559
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-115.xht.ini
@@ -0,0 +1,3 @@
+[floats-115.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
new file mode 100644
index 000000000000..e782caf42799
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-116.xht.ini
@@ -0,0 +1,3 @@
+[floats-116.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
new file mode 100644
index 000000000000..12cbe35b80e4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-117.xht.ini
@@ -0,0 +1,3 @@
+[floats-117.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
new file mode 100644
index 000000000000..a22aa6ed6951
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-118.xht.ini
@@ -0,0 +1,3 @@
+[floats-118.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
new file mode 100644
index 000000000000..ccfe19f3779c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-119.xht.ini
@@ -0,0 +1,3 @@
+[floats-119.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
new file mode 100644
index 000000000000..cd5239dd6406
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-120.xht.ini
@@ -0,0 +1,3 @@
+[floats-120.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
new file mode 100644
index 000000000000..b6ecf7bae571
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-121.xht.ini
@@ -0,0 +1,3 @@
+[floats-121.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
new file mode 100644
index 000000000000..515575fb3bfc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-122.xht.ini
@@ -0,0 +1,3 @@
+[floats-122.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
new file mode 100644
index 000000000000..2db744484a01
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-123.xht.ini
@@ -0,0 +1,3 @@
+[floats-123.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
new file mode 100644
index 000000000000..464fcbbbaa27
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-132.xht.ini
@@ -0,0 +1,3 @@
+[floats-132.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
new file mode 100644
index 000000000000..f448ac4f0106
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-133.xht.ini
@@ -0,0 +1,3 @@
+[floats-133.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
new file mode 100644
index 000000000000..4a7efa10a390
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-134.xht.ini
@@ -0,0 +1,3 @@
+[floats-134.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
new file mode 100644
index 000000000000..378ca492c791
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-136.xht.ini
@@ -0,0 +1,3 @@
+[floats-136.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini b/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
new file mode 100644
index 000000000000..e117959fa5f2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/floats-clear/floats-145.xht.ini
@@ -0,0 +1,3 @@
+[floats-145.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
index b0f366f76e2b..c96a5c66fcae 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-011.xht.ini
@@ -1,13 +1,4 @@
 [font-011.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
index 05808c5c39da..932aa628cbd8 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-012.xht.ini
@@ -1,13 +1,4 @@
 [font-012.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
index a9314b0f3307..b97baf2408a6 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-013.xht.ini
@@ -1,13 +1,4 @@
 [font-013.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
index e1e91a5b0218..dbf7cdb97630 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-014.xht.ini
@@ -1,13 +1,4 @@
 [font-014.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
index ecf469e3bd11..d3a1199b5515 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-015.xht.ini
@@ -1,13 +1,4 @@
 [font-015.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
index 614e24466977..50afda26881b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-016.xht.ini
@@ -1,13 +1,4 @@
 [font-016.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
index 13489358eaab..9ae75c0c604d 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-029.xht.ini
@@ -1,13 +1,4 @@
 [font-029.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
index fd5b861700e1..d68f5303b211 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-030.xht.ini
@@ -1,13 +1,4 @@
 [font-030.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
index 5632e4da2313..7c30bd718fae 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-031.xht.ini
@@ -1,13 +1,4 @@
 [font-031.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
index 168da05bd4e6..942960afea4f 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-032.xht.ini
@@ -1,13 +1,4 @@
 [font-032.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
index ec6dbbb6a57c..c18cd4881d08 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-042.xht.ini
@@ -1,13 +1,4 @@
 [font-042.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
index 5c2f6121d876..3f912a30b3f5 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-043.xht.ini
@@ -1,13 +1,4 @@
 [font-043.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
new file mode 100644
index 000000000000..85e6f4d642ae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-051.xht.ini
@@ -0,0 +1,3 @@
+[font-051.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
new file mode 100644
index 000000000000..d358803ad129
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-009.xht.ini
@@ -0,0 +1,3 @@
+[font-family-009.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
index bda6d93c360e..e9d9a02e1cc1 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-001.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-001.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
index 3e62f6da2563..8141f65d121b 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-002.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-002.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
index a05d9757bae7..b8ae768958be 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-005.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-005.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
index 3d26a145ffc6..ccb408b9cf48 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-006.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-006.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
index 664f831ac9db..d9de340b3929 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-007.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-007.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
index c973de58977c..19fe16eda4de 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-008.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-008.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
index 2d32b9ac6552..07ecbccba7c2 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-009.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-009.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
index c1a2322605ae..d9b07e63a90c 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-010.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-010.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
index ba2223949ecb..ddb74c1df1e5 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-011.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-011.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
index 980126bcb524..51e6cb56bc95 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-014.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-014.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
index c82a2bd910e3..2ffde52eb6e9 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-015.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-015.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
index 47a5ec6b6572..1fa5760da257 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-family-applies-to-017.xht.ini
@@ -1,13 +1,4 @@
 [font-family-applies-to-017.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
new file mode 100644
index 000000000000..4838ed24bc12
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-size-120.xht.ini
@@ -0,0 +1,3 @@
+[font-size-120.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
index d37cfb2e72d6..8810990b00ba 100644
--- a/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-size-122.xht.ini
@@ -1,13 +1,4 @@
 [font-size-122.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
new file mode 100644
index 000000000000..8c017d7359c7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/font-size-124.xht.ini
@@ -0,0 +1,3 @@
+[font-size-124.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
new file mode 100644
index 000000000000..c6b1bc063e88
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/fonts-010.xht.ini
@@ -0,0 +1,3 @@
+[fonts-010.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini b/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
new file mode 100644
index 000000000000..1effa7d61624
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/fonts/fonts-011.xht.ini
@@ -0,0 +1,3 @@
+[fonts-011.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
new file mode 100644
index 000000000000..12cc3ad60656
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-001.xht.ini
@@ -0,0 +1,4 @@
+[border-padding-bleed-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
new file mode 100644
index 000000000000..9a683214b55e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-002.xht.ini
@@ -0,0 +1,4 @@
+[border-padding-bleed-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
new file mode 100644
index 000000000000..3d3bb37c91fc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/border-padding-bleed-003.xht.ini
@@ -0,0 +1,4 @@
+[border-padding-bleed-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
new file mode 100644
index 000000000000..229e456ea418
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-008.xht.ini
@@ -0,0 +1,4 @@
+[inline-formatting-context-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
new file mode 100644
index 000000000000..cde923583fce
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-009.xht.ini
@@ -0,0 +1,4 @@
+[inline-formatting-context-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
new file mode 100644
index 000000000000..a50cf5001ab3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-011.xht.ini
@@ -0,0 +1,4 @@
+[inline-formatting-context-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
new file mode 100644
index 000000000000..52b624e810ce
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-013.xht.ini
@@ -0,0 +1,4 @@
+[inline-formatting-context-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
new file mode 100644
index 000000000000..c369bee9a41b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/inline-formatting-context-022.xht.ini
@@ -0,0 +1,4 @@
+[inline-formatting-context-022.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
new file mode 100644
index 000000000000..a147f0164559
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/leading-001.xht.ini
@@ -0,0 +1,4 @@
+[leading-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
new file mode 100644
index 000000000000..50c0379b4cae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-002.xht.ini
@@ -0,0 +1,4 @@
+[line-height-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
new file mode 100644
index 000000000000..4831608f72a2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-004.xht.ini
@@ -0,0 +1,4 @@
+[line-height-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
new file mode 100644
index 000000000000..c7371e2cdad2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-005.xht.ini
@@ -0,0 +1,4 @@
+[line-height-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
new file mode 100644
index 000000000000..2fb2bed4c769
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-006.xht.ini
@@ -0,0 +1,4 @@
+[line-height-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
new file mode 100644
index 000000000000..871a2d99cf0c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-007.xht.ini
@@ -0,0 +1,4 @@
+[line-height-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
new file mode 100644
index 000000000000..f6d1fd5b5f46
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-013.xht.ini
@@ -0,0 +1,4 @@
+[line-height-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
new file mode 100644
index 000000000000..6b8de39ee627
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-015.xht.ini
@@ -0,0 +1,4 @@
+[line-height-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
new file mode 100644
index 000000000000..3f24b1253ce9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-016.xht.ini
@@ -0,0 +1,4 @@
+[line-height-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
new file mode 100644
index 000000000000..f7e16302d8a8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-017.xht.ini
@@ -0,0 +1,4 @@
+[line-height-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
new file mode 100644
index 000000000000..febc13f1f771
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-018.xht.ini
@@ -0,0 +1,4 @@
+[line-height-018.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
new file mode 100644
index 000000000000..3907494b6fe0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-024.xht.ini
@@ -0,0 +1,4 @@
+[line-height-024.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
new file mode 100644
index 000000000000..bd56b165f477
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-025.xht.ini
@@ -0,0 +1,4 @@
+[line-height-025.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
new file mode 100644
index 000000000000..75bbe3dbfa9c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-026.xht.ini
@@ -0,0 +1,4 @@
+[line-height-026.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
new file mode 100644
index 000000000000..1730fdb3dc44
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-027.xht.ini
@@ -0,0 +1,4 @@
+[line-height-027.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
new file mode 100644
index 000000000000..13acc52dfbaa
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-028.xht.ini
@@ -0,0 +1,4 @@
+[line-height-028.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
new file mode 100644
index 000000000000..b64503252994
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-029.xht.ini
@@ -0,0 +1,4 @@
+[line-height-029.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
new file mode 100644
index 000000000000..7be6184ea142
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-035.xht.ini
@@ -0,0 +1,4 @@
+[line-height-035.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
new file mode 100644
index 000000000000..f1a38e0829bd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-037.xht.ini
@@ -0,0 +1,4 @@
+[line-height-037.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
new file mode 100644
index 000000000000..283cc39e3034
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-038.xht.ini
@@ -0,0 +1,4 @@
+[line-height-038.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
new file mode 100644
index 000000000000..4e0df393c48d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-039.xht.ini
@@ -0,0 +1,4 @@
+[line-height-039.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
new file mode 100644
index 000000000000..dac7f0d83144
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-040.xht.ini
@@ -0,0 +1,4 @@
+[line-height-040.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
new file mode 100644
index 000000000000..283080d2c82f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-046.xht.ini
@@ -0,0 +1,4 @@
+[line-height-046.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
new file mode 100644
index 000000000000..9f435bdce2e0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-048.xht.ini
@@ -0,0 +1,4 @@
+[line-height-048.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
new file mode 100644
index 000000000000..ce3379879437
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-049.xht.ini
@@ -0,0 +1,4 @@
+[line-height-049.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
new file mode 100644
index 000000000000..ae47e25213db
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-050.xht.ini
@@ -0,0 +1,4 @@
+[line-height-050.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
new file mode 100644
index 000000000000..e89bd4a4ebdc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-051.xht.ini
@@ -0,0 +1,4 @@
+[line-height-051.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
new file mode 100644
index 000000000000..3ac28768bacf
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-057.xht.ini
@@ -0,0 +1,4 @@
+[line-height-057.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
new file mode 100644
index 000000000000..5413e63983a1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-058.xht.ini
@@ -0,0 +1,4 @@
+[line-height-058.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
new file mode 100644
index 000000000000..2aa328b5f08d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-059.xht.ini
@@ -0,0 +1,4 @@
+[line-height-059.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
new file mode 100644
index 000000000000..9fe04bd11279
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-060.xht.ini
@@ -0,0 +1,4 @@
+[line-height-060.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
new file mode 100644
index 000000000000..3d2c06cf863f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-061.xht.ini
@@ -0,0 +1,4 @@
+[line-height-061.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
new file mode 100644
index 000000000000..f82bbfc53911
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-062.xht.ini
@@ -0,0 +1,4 @@
+[line-height-062.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
new file mode 100644
index 000000000000..cb4e4ce53a18
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-068.xht.ini
@@ -0,0 +1,4 @@
+[line-height-068.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
new file mode 100644
index 000000000000..0ea1e482fa43
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-069.xht.ini
@@ -0,0 +1,4 @@
+[line-height-069.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
new file mode 100644
index 000000000000..849e34834575
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-070.xht.ini
@@ -0,0 +1,4 @@
+[line-height-070.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
new file mode 100644
index 000000000000..e63ebdc63546
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-071.xht.ini
@@ -0,0 +1,4 @@
+[line-height-071.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
new file mode 100644
index 000000000000..f14aff60a6aa
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-072.xht.ini
@@ -0,0 +1,4 @@
+[line-height-072.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
new file mode 100644
index 000000000000..5b97c038f39c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-073.xht.ini
@@ -0,0 +1,4 @@
+[line-height-073.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
new file mode 100644
index 000000000000..5351e913d6aa
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-079.xht.ini
@@ -0,0 +1,4 @@
+[line-height-079.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
new file mode 100644
index 000000000000..9b7603212e9b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-080.xht.ini
@@ -0,0 +1,4 @@
+[line-height-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
new file mode 100644
index 000000000000..c2272b798131
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-081.xht.ini
@@ -0,0 +1,4 @@
+[line-height-081.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
new file mode 100644
index 000000000000..947c0463290e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-082.xht.ini
@@ -0,0 +1,4 @@
+[line-height-082.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
new file mode 100644
index 000000000000..7d33bda351e5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-083.xht.ini
@@ -0,0 +1,4 @@
+[line-height-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
new file mode 100644
index 000000000000..1a1b8512202d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-084.xht.ini
@@ -0,0 +1,4 @@
+[line-height-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
new file mode 100644
index 000000000000..0e2862ab92f2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-090.xht.ini
@@ -0,0 +1,4 @@
+[line-height-090.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
new file mode 100644
index 000000000000..50bcd0b61515
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-092.xht.ini
@@ -0,0 +1,4 @@
+[line-height-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
new file mode 100644
index 000000000000..7924026e4897
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-093.xht.ini
@@ -0,0 +1,4 @@
+[line-height-093.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
new file mode 100644
index 000000000000..87623e054d4d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-094.xht.ini
@@ -0,0 +1,4 @@
+[line-height-094.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
new file mode 100644
index 000000000000..ddb457f7b68a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-095.xht.ini
@@ -0,0 +1,4 @@
+[line-height-095.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
new file mode 100644
index 000000000000..edaf40f0bdb2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-101.xht.ini
@@ -0,0 +1,4 @@
+[line-height-101.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
new file mode 100644
index 000000000000..e49e019f17a8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-102.xht.ini
@@ -0,0 +1,4 @@
+[line-height-102.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
new file mode 100644
index 000000000000..ef5da82d3e77
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-103.xht.ini
@@ -0,0 +1,4 @@
+[line-height-103.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
new file mode 100644
index 000000000000..9c0501d19027
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-104.xht.ini
@@ -0,0 +1,4 @@
+[line-height-104.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
new file mode 100644
index 000000000000..216655ccfa4c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-105.xht.ini
@@ -0,0 +1,4 @@
+[line-height-105.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
new file mode 100644
index 000000000000..ecb4821944e0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-106.xht.ini
@@ -0,0 +1,4 @@
+[line-height-106.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
new file mode 100644
index 000000000000..3a8a95b84783
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-112.xht.ini
@@ -0,0 +1,4 @@
+[line-height-112.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
new file mode 100644
index 000000000000..37e9e20f7eb3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-121.xht.ini
@@ -0,0 +1,4 @@
+[line-height-121.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
new file mode 100644
index 000000000000..17bc0349699c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-127.xht.ini
@@ -0,0 +1,4 @@
+[line-height-127.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
new file mode 100644
index 000000000000..7f00b48a5d37
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-128.xht.ini
@@ -0,0 +1,4 @@
+[line-height-128.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
new file mode 100644
index 000000000000..02d875828623
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/line-height-bleed-002.xht.ini
@@ -0,0 +1,4 @@
+[line-height-bleed-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
new file mode 100644
index 000000000000..cf17447f08d1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-004.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
new file mode 100644
index 000000000000..21d7794dcf45
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-005.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
new file mode 100644
index 000000000000..eb7e8d59c504
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-006.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
new file mode 100644
index 000000000000..c998200fa834
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-007.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
new file mode 100644
index 000000000000..b4eabec7cc0c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-008.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
new file mode 100644
index 000000000000..381f677412dc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-016.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
new file mode 100644
index 000000000000..067c5dd64b1f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-017.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
new file mode 100644
index 000000000000..8fcaa1e79419
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-018.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-018.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
new file mode 100644
index 000000000000..155bb1fe5071
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-019.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
new file mode 100644
index 000000000000..4915636edb9d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-020.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
new file mode 100644
index 000000000000..420988283570
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-028.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-028.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
new file mode 100644
index 000000000000..529cc1f73b44
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-029.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-029.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
new file mode 100644
index 000000000000..f3171f3ec079
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-030.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-030.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
new file mode 100644
index 000000000000..4fb9471fd909
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-031.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-031.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
new file mode 100644
index 000000000000..e8a1e6caf5a6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-032.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-032.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
new file mode 100644
index 000000000000..330531c12cc0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-040.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-040.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
new file mode 100644
index 000000000000..85cb29202236
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-041.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-041.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
new file mode 100644
index 000000000000..3fbdd355288d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-042.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-042.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
new file mode 100644
index 000000000000..7c3f75407c4c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-043.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-043.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
new file mode 100644
index 000000000000..20b0341a0c9d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-044.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-044.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
new file mode 100644
index 000000000000..7ec5bd0173fe
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-052.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-052.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
new file mode 100644
index 000000000000..f4589cfdfdbe
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-053.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-053.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
new file mode 100644
index 000000000000..faa8a24f2baa
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-054.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-054.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
new file mode 100644
index 000000000000..694faa82912a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-055.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-055.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
new file mode 100644
index 000000000000..110126661a72
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-056.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-056.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
new file mode 100644
index 000000000000..b4446e5076c6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-064.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-064.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
new file mode 100644
index 000000000000..0c5a96483cb3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-065.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-065.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
new file mode 100644
index 000000000000..06aa8b6879a9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-066.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-066.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
new file mode 100644
index 000000000000..ba0a05a1256b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-067.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-067.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
new file mode 100644
index 000000000000..eba17d474854
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-068.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-068.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
new file mode 100644
index 000000000000..666fcce40e65
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-076.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-076.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
new file mode 100644
index 000000000000..7d31c1f82dfb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-077.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-077.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
new file mode 100644
index 000000000000..cbf1b9535c0b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-078.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-078.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
new file mode 100644
index 000000000000..bd5db7721302
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-079.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-079.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
new file mode 100644
index 000000000000..dee7a30e5870
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-080.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
new file mode 100644
index 000000000000..f5513619d988
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-088.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-088.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
new file mode 100644
index 000000000000..f177103608f9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-089.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-089.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
new file mode 100644
index 000000000000..8fd1bbd7815c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-090.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-090.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
new file mode 100644
index 000000000000..2dca8fde1cb4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-091.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-091.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
new file mode 100644
index 000000000000..2d88a4ff080e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-092.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
new file mode 100644
index 000000000000..c6f3089a3890
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-100.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-100.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
new file mode 100644
index 000000000000..303ce09ff212
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-101.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-101.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
new file mode 100644
index 000000000000..83e26bbde7dc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-102.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-102.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
new file mode 100644
index 000000000000..3a7739490f38
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-103.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-103.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
new file mode 100644
index 000000000000..00d30a7a36d3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-104.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-104.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
new file mode 100644
index 000000000000..44a5dd6a9463
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-109.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-109.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
new file mode 100644
index 000000000000..e752dead0453
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-110.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-110.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
new file mode 100644
index 000000000000..8a76667d99d1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-111.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-111.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
new file mode 100644
index 000000000000..176af1555b50
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-117a.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-117a.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
new file mode 100644
index 000000000000..c380edd8fc79
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-118a.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-118a.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
new file mode 100644
index 000000000000..e2edf139bf7b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-121.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-121.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
new file mode 100644
index 000000000000..86d73b7c2fc6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-001.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
new file mode 100644
index 000000000000..357e9fad0a6b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-002.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
new file mode 100644
index 000000000000..0f2a30b5cb1f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-003.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
new file mode 100644
index 000000000000..b16b7c4981a1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-004.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
new file mode 100644
index 000000000000..32f52fef5971
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-005.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
new file mode 100644
index 000000000000..e26c76b3ca8f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-006.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
new file mode 100644
index 000000000000..c27b781aa940
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-007.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
new file mode 100644
index 000000000000..98482a6c8b1e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-008.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
new file mode 100644
index 000000000000..452559740627
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-009.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
new file mode 100644
index 000000000000..f06706177ca3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-012.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
new file mode 100644
index 000000000000..3ae80b593b97
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-013.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
new file mode 100644
index 000000000000..87be0e773c67
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-014.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
new file mode 100644
index 000000000000..2a89d73af9fb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-applies-to-015.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-applies-to-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
new file mode 100644
index 000000000000..55a1143f755d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-001.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-baseline-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
new file mode 100644
index 000000000000..093b9ada572d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-002.xht.ini
@@ -0,0 +1,4 @@
+[vertical-align-baseline-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
index f7818d3a154a..339c64bb1c1a 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-004a.xht.ini
@@ -1,9 +1,7 @@
 [vertical-align-baseline-004a.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
index 3de3f64bee33..51c8f80ed304 100644
--- a/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/linebox/vertical-align-baseline-005a.xht.ini
@@ -1,9 +1,7 @@
 [vertical-align-baseline-005a.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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.15063") and (processor == "x86_64") and (bits == 64): PASS
+    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
+    FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
new file mode 100644
index 000000000000..5f1b283b007e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-border-padding-001.xht.ini
@@ -0,0 +1,3 @@
+[margin-border-padding-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
new file mode 100644
index 000000000000..1ff5c8d349e0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-091.xht.ini
@@ -0,0 +1,3 @@
+[margin-bottom-091.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
new file mode 100644
index 000000000000..8f3b4dbb64ba
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-092.xht.ini
@@ -0,0 +1,3 @@
+[margin-bottom-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
new file mode 100644
index 000000000000..2c6d4e268567
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-bottom-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[margin-bottom-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
new file mode 100644
index 000000000000..13fcad29312f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-106.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-106.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
new file mode 100644
index 000000000000..2f41bc5a8f76
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-130.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-130.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
new file mode 100644
index 000000000000..74119be9729f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-131.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-131.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
new file mode 100644
index 000000000000..139c627c4130
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-137.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-137.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
new file mode 100644
index 000000000000..f0b49de7b201
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-138.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-138.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
new file mode 100644
index 000000000000..21487cfe161d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-collapse-155.xht.ini
@@ -0,0 +1,3 @@
+[margin-collapse-155.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
new file mode 100644
index 000000000000..f9babbcdfcbb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-inline-001.xht.ini
@@ -0,0 +1,3 @@
+[margin-inline-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
new file mode 100644
index 000000000000..008ac66de542
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-091.xht.ini
@@ -0,0 +1,3 @@
+[margin-left-091.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
new file mode 100644
index 000000000000..21f25e649fb9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-left-092.xht.ini
@@ -0,0 +1,3 @@
+[margin-left-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
new file mode 100644
index 000000000000..c02c4a69c06e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-091.xht.ini
@@ -0,0 +1,3 @@
+[margin-right-091.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
new file mode 100644
index 000000000000..20c3b1fb1348
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-right-092.xht.ini
@@ -0,0 +1,3 @@
+[margin-right-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
new file mode 100644
index 000000000000..8cb9fb8dbccb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-091.xht.ini
@@ -0,0 +1,3 @@
+[margin-top-091.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
new file mode 100644
index 000000000000..6672cb7b074c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-092.xht.ini
@@ -0,0 +1,3 @@
+[margin-top-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
new file mode 100644
index 000000000000..8df2ee37c6c7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/margin-top-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[margin-top-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
new file mode 100644
index 000000000000..0e2b0dc81744
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-080.xht.ini
@@ -0,0 +1,3 @@
+[padding-bottom-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
new file mode 100644
index 000000000000..af7c7069a56f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-083.xht.ini
@@ -0,0 +1,3 @@
+[padding-bottom-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
new file mode 100644
index 000000000000..d9d6ebf10113
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-bottom-084.xht.ini
@@ -0,0 +1,3 @@
+[padding-bottom-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
new file mode 100644
index 000000000000..c4258f52f65a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-080.xht.ini
@@ -0,0 +1,3 @@
+[padding-left-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
new file mode 100644
index 000000000000..091577635414
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-083.xht.ini
@@ -0,0 +1,3 @@
+[padding-left-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
new file mode 100644
index 000000000000..b141c08c7cdc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-left-084.xht.ini
@@ -0,0 +1,3 @@
+[padding-left-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
new file mode 100644
index 000000000000..31896f35a895
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-080.xht.ini
@@ -0,0 +1,3 @@
+[padding-right-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
new file mode 100644
index 000000000000..465ca0c1be36
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-083.xht.ini
@@ -0,0 +1,3 @@
+[padding-right-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
new file mode 100644
index 000000000000..06831df669ac
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-right-084.xht.ini
@@ -0,0 +1,3 @@
+[padding-right-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
new file mode 100644
index 000000000000..320f75dbbaab
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-080.xht.ini
@@ -0,0 +1,3 @@
+[padding-top-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
new file mode 100644
index 000000000000..9792b40e1084
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-083.xht.ini
@@ -0,0 +1,3 @@
+[padding-top-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
new file mode 100644
index 000000000000..74d79ccf2327
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/margin-padding-clear/padding-top-084.xht.ini
@@ -0,0 +1,3 @@
+[padding-top-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
new file mode 100644
index 000000000000..69883edbfd40
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/block-formatting-contexts-004.xht.ini
@@ -0,0 +1,3 @@
+[block-formatting-contexts-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
new file mode 100644
index 000000000000..1333a0eac636
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-height-005.xht.ini
@@ -0,0 +1,3 @@
+[block-non-replaced-height-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
new file mode 100644
index 000000000000..9349981ceac8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/block-non-replaced-width-007.xht.ini
@@ -0,0 +1,3 @@
+[block-non-replaced-width-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
new file mode 100644
index 000000000000..a052b529cdd2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/block-replaced-width-006.xht.ini
@@ -0,0 +1,3 @@
+[block-replaced-width-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
new file mode 100644
index 000000000000..aba961f32b52
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/blocks-017.xht.ini
@@ -0,0 +1,3 @@
+[blocks-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
new file mode 100644
index 000000000000..8860e73b247d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/height-080.xht.ini
@@ -0,0 +1,3 @@
+[height-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
new file mode 100644
index 000000000000..7f2c48aabc51
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/height-083.xht.ini
@@ -0,0 +1,3 @@
+[height-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
new file mode 100644
index 000000000000..d170672f10fe
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/height-084.xht.ini
@@ -0,0 +1,3 @@
+[height-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
new file mode 100644
index 000000000000..000c45662f06
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-001.xht.ini
@@ -0,0 +1,3 @@
+[inline-block-non-replaced-width-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
new file mode 100644
index 000000000000..e0a060afb106
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-002.xht.ini
@@ -0,0 +1,3 @@
+[inline-block-non-replaced-width-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
new file mode 100644
index 000000000000..46cce6a19d74
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-003.xht.ini
@@ -0,0 +1,3 @@
+[inline-block-non-replaced-width-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
new file mode 100644
index 000000000000..59de3d979e59
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-block-non-replaced-width-004.xht.ini
@@ -0,0 +1,3 @@
+[inline-block-non-replaced-width-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
new file mode 100644
index 000000000000..fc39407aeb52
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-002.xht.ini
@@ -0,0 +1,3 @@
+[inline-non-replaced-height-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
new file mode 100644
index 000000000000..0cb917413a83
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-height-003.xht.ini
@@ -0,0 +1,3 @@
+[inline-non-replaced-height-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
new file mode 100644
index 000000000000..d97668d5bf89
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-001.xht.ini
@@ -0,0 +1,3 @@
+[inline-non-replaced-width-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
new file mode 100644
index 000000000000..93feaa3128dc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inline-non-replaced-width-002.xht.ini
@@ -0,0 +1,3 @@
+[inline-non-replaced-width-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
new file mode 100644
index 000000000000..e2c5531343b5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-016.xht.ini
@@ -0,0 +1,3 @@
+[inlines-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
new file mode 100644
index 000000000000..094df486738b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/inlines-017.xht.ini
@@ -0,0 +1,3 @@
+[inlines-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
new file mode 100644
index 000000000000..1852bbf200d5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-080.xht.ini
@@ -0,0 +1,3 @@
+[max-height-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
new file mode 100644
index 000000000000..b6eadd76cc1e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-083.xht.ini
@@ -0,0 +1,3 @@
+[max-height-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
new file mode 100644
index 000000000000..ac750433f7ba
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-084.xht.ini
@@ -0,0 +1,3 @@
+[max-height-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
new file mode 100644
index 000000000000..66cb95409142
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-height-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[max-height-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
new file mode 100644
index 000000000000..6b10d6adb5ca
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-080.xht.ini
@@ -0,0 +1,3 @@
+[max-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
new file mode 100644
index 000000000000..7655faa2d2cd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-083.xht.ini
@@ -0,0 +1,3 @@
+[max-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
new file mode 100644
index 000000000000..119ddc756c07
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-084.xht.ini
@@ -0,0 +1,3 @@
+[max-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
new file mode 100644
index 000000000000..42dee9f31fcb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-107.xht.ini
@@ -0,0 +1,3 @@
+[max-width-107.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
new file mode 100644
index 000000000000..af44ab714cc0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/max-width-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[max-width-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
new file mode 100644
index 000000000000..15be64ba7155
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-067.xht.ini
@@ -0,0 +1,3 @@
+[min-height-067.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
new file mode 100644
index 000000000000..d68ac05b3d5c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-068.xht.ini
@@ -0,0 +1,3 @@
+[min-height-068.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
new file mode 100644
index 000000000000..0a6b6354b9a3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-070.xht.ini
@@ -0,0 +1,3 @@
+[min-height-070.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
new file mode 100644
index 000000000000..bc4ea096b494
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-071.xht.ini
@@ -0,0 +1,3 @@
+[min-height-071.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
new file mode 100644
index 000000000000..508b2f4a25d1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-078.xht.ini
@@ -0,0 +1,3 @@
+[min-height-078.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
new file mode 100644
index 000000000000..4d90849513b0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-079.xht.ini
@@ -0,0 +1,3 @@
+[min-height-079.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
new file mode 100644
index 000000000000..20d3dccfe5a2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-080.xht.ini
@@ -0,0 +1,3 @@
+[min-height-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
new file mode 100644
index 000000000000..8e93f9e8bd20
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-081.xht.ini
@@ -0,0 +1,3 @@
+[min-height-081.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
new file mode 100644
index 000000000000..1c4e48f82c16
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-082.xht.ini
@@ -0,0 +1,3 @@
+[min-height-082.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
new file mode 100644
index 000000000000..5c8a8ee90d30
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-083.xht.ini
@@ -0,0 +1,3 @@
+[min-height-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
new file mode 100644
index 000000000000..070e825cec01
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-084.xht.ini
@@ -0,0 +1,3 @@
+[min-height-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
new file mode 100644
index 000000000000..b84c66279e9a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-height-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[min-height-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
new file mode 100644
index 000000000000..f52b82266013
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-080.xht.ini
@@ -0,0 +1,3 @@
+[min-width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
new file mode 100644
index 000000000000..90e9cdba12d4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-083.xht.ini
@@ -0,0 +1,3 @@
+[min-width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
new file mode 100644
index 000000000000..f19aa7d74837
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-084.xht.ini
@@ -0,0 +1,3 @@
+[min-width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
new file mode 100644
index 000000000000..8d0dc948f859
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/min-width-applies-to-008.xht.ini
@@ -0,0 +1,3 @@
+[min-width-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
new file mode 100644
index 000000000000..75ecaa41a231
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/width-080.xht.ini
@@ -0,0 +1,3 @@
+[width-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
new file mode 100644
index 000000000000..d32a40639361
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/width-083.xht.ini
@@ -0,0 +1,3 @@
+[width-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini b/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
new file mode 100644
index 000000000000..a101d2cda066
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/normal-flow/width-084.xht.ini
@@ -0,0 +1,3 @@
+[width-084.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
new file mode 100644
index 000000000000..d6c276d9e38b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-002.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-height-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
new file mode 100644
index 000000000000..5941be5d93f7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-007.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-height-007.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
new file mode 100644
index 000000000000..91b7d3788c5d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-height-009.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-height-009.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
new file mode 100644
index 000000000000..404146e066d5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-max-height-002.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-max-height-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
new file mode 100644
index 000000000000..976da61cd893
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-001.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
new file mode 100644
index 000000000000..66170779cfca
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-002.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
new file mode 100644
index 000000000000..de23383f426c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-003.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
new file mode 100644
index 000000000000..6a1659960c4b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-004.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
new file mode 100644
index 000000000000..ae6d7eebea07
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-005.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
new file mode 100644
index 000000000000..27c2e7f85229
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-006.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-006.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
new file mode 100644
index 000000000000..13a91cbd93ae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-007.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-007.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
new file mode 100644
index 000000000000..48131908e9c4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-008.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-008.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
new file mode 100644
index 000000000000..694164ae86f8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-010.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-010.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
new file mode 100644
index 000000000000..9bdc1232b40a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-011.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-011.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
new file mode 100644
index 000000000000..2d23f174c993
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-012.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-012.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
new file mode 100644
index 000000000000..cf94b6c10b6a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-013.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-013.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
new file mode 100644
index 000000000000..f2c99f4d5e34
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-014.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-014.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
new file mode 100644
index 000000000000..cb465ee95232
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-016.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-016.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
new file mode 100644
index 000000000000..0128b65e7b85
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-017.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-017.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
new file mode 100644
index 000000000000..b744fe8516b3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-018.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-018.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
new file mode 100644
index 000000000000..fd42369b44d0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-019.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-019.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
new file mode 100644
index 000000000000..472b3c0dd960
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-020.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-020.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
new file mode 100644
index 000000000000..f0d126d4a76f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-021.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-021.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
new file mode 100644
index 000000000000..84091ae8a3ef
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-022.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-022.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
new file mode 100644
index 000000000000..d7eed39e28e3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-023.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-023.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
new file mode 100644
index 000000000000..cfe781b0d033
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/absolute-non-replaced-width-024.xht.ini
@@ -0,0 +1,3 @@
+[absolute-non-replaced-width-024.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
new file mode 100644
index 000000000000..8520bdedb5ae
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/bottom-091.xht.ini
@@ -0,0 +1,3 @@
+[bottom-091.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
new file mode 100644
index 000000000000..b6411e1d3750
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/bottom-092.xht.ini
@@ -0,0 +1,3 @@
+[bottom-092.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
new file mode 100644
index 000000000000..4df1e74d6ec0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/left-091.xht.ini
@@ -0,0 +1,3 @@
+[left-091.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
new file mode 100644
index 000000000000..fe3108bb6942
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/left-092.xht.ini
@@ -0,0 +1,3 @@
+[left-092.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
new file mode 100644
index 000000000000..362d8215d76c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/position-relative-033.xht.ini
@@ -0,0 +1,3 @@
+[position-relative-033.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
new file mode 100644
index 000000000000..4c62dc5aebac
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/right-091.xht.ini
@@ -0,0 +1,3 @@
+[right-091.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
new file mode 100644
index 000000000000..9fd49d027f2f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/right-092.xht.ini
@@ -0,0 +1,3 @@
+[right-092.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
new file mode 100644
index 000000000000..2d5b155115b9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/top-091.xht.ini
@@ -0,0 +1,3 @@
+[top-091.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini b/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
new file mode 100644
index 000000000000..46955fe48609
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/positioning/top-092.xht.ini
@@ -0,0 +1,3 @@
+[top-092.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
new file mode 100644
index 000000000000..8e981dc00774
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-012.xht.ini
@@ -0,0 +1,4 @@
+[first-line-pseudo-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
new file mode 100644
index 000000000000..e9e300ad4ef8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-013.xht.ini
@@ -0,0 +1,4 @@
+[first-line-pseudo-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
new file mode 100644
index 000000000000..e96d3843fef1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-014.xht.ini
@@ -0,0 +1,4 @@
+[first-line-pseudo-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
new file mode 100644
index 000000000000..da4acf85ee2d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-015.xht.ini
@@ -0,0 +1,4 @@
+[first-line-pseudo-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
new file mode 100644
index 000000000000..2374d59904a2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/selectors/first-line-pseudo-016.xht.ini
@@ -0,0 +1,4 @@
+[first-line-pseudo-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
new file mode 100644
index 000000000000..ca7457576d24
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010a.xht.ini
@@ -0,0 +1,3 @@
+[collapsing-border-model-010a.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
new file mode 100644
index 000000000000..4a070ad359e4
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/collapsing-border-model-010b.xht.ini
@@ -0,0 +1,3 @@
+[collapsing-border-model-010b.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
new file mode 100644
index 000000000000..cc0e9ad078a5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008a.xht.ini
@@ -0,0 +1,3 @@
+[table-height-algorithm-008a.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
new file mode 100644
index 000000000000..f9bb1efa7e4f
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008b.xht.ini
@@ -0,0 +1,3 @@
+[table-height-algorithm-008b.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
new file mode 100644
index 000000000000..ac04582dca7b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/table-height-algorithm-008c.xht.ini
@@ -0,0 +1,3 @@
+[table-height-algorithm-008c.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini b/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
new file mode 100644
index 000000000000..bde502399417
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/tables/table-margin-004.xht.ini
@@ -0,0 +1,3 @@
+[table-margin-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
new file mode 100644
index 000000000000..60cbe77bd350
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-001.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
new file mode 100644
index 000000000000..6406469afd38
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-002.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
new file mode 100644
index 000000000000..db80eca051b8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-006.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
new file mode 100644
index 000000000000..d149e1dfe1b9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-008.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
new file mode 100644
index 000000000000..dfe1d9711a52
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-009.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
new file mode 100644
index 000000000000..37df6c0cd337
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-010.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-010.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
new file mode 100644
index 000000000000..91a79556d6d1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-011.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
new file mode 100644
index 000000000000..b5d0c1bcdd74
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-014.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
new file mode 100644
index 000000000000..d666980bdadc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/letter-spacing-applies-to-015.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
new file mode 100644
index 000000000000..bcf7db9d3fcb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/painting-order-underline-001.xht.ini
@@ -0,0 +1,4 @@
+[painting-order-underline-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
new file mode 100644
index 000000000000..123b96bd5bf9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-bidi-011.xht.ini
@@ -0,0 +1,4 @@
+[text-align-bidi-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
new file mode 100644
index 000000000000..2d26b5b87d7e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-001.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
new file mode 100644
index 000000000000..acbfd861a82e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-002.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
new file mode 100644
index 000000000000..8fd713ff0fba
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-003.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
new file mode 100644
index 000000000000..9c48a2fc9a46
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-004.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
new file mode 100644
index 000000000000..f6794bc5230b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-005.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
new file mode 100644
index 000000000000..c91d075aaac1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-006.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
new file mode 100644
index 000000000000..b6991d27331d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-007.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
new file mode 100644
index 000000000000..b73f17e9e9d3
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-align-white-space-008.xht.ini
@@ -0,0 +1,4 @@
+[text-align-white-space-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
new file mode 100644
index 000000000000..0db081dce04e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-007.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
new file mode 100644
index 000000000000..6e2295ece61e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-008.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
new file mode 100644
index 000000000000..e39d15c981bd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-012.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
new file mode 100644
index 000000000000..a181daffebf2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-019.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
new file mode 100644
index 000000000000..1615a594bda9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-020.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
new file mode 100644
index 000000000000..e01c44674e2d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-031.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-031.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
new file mode 100644
index 000000000000..856c50992622
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-032.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-032.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
new file mode 100644
index 000000000000..e177ee8eb66d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-043.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-043.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
new file mode 100644
index 000000000000..cdc6c9ebc7f9
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-044.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-044.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
new file mode 100644
index 000000000000..bfa1928668cb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-055.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-055.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
new file mode 100644
index 000000000000..a83273f12829
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-056.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-056.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
new file mode 100644
index 000000000000..d859170467ea
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-067.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-067.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
new file mode 100644
index 000000000000..465585843d04
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-068.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-068.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
new file mode 100644
index 000000000000..bdac38e99675
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-079.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-079.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini b/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
new file mode 100644
index 000000000000..a448d05f56b7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/text-indent-080.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
new file mode 100644
index 000000000000..501f29ba5b75
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-001.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
new file mode 100644
index 000000000000..7b9b115041dc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-002.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
new file mode 100644
index 000000000000..9e576c37ad7b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-004.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
new file mode 100644
index 000000000000..bcdfbe18a4bc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-005.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
new file mode 100644
index 000000000000..c9fd9f473ee0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-002.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-bidi-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
new file mode 100644
index 000000000000..aced1cc4456e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-collapsing-bidi-003.xht.ini
@@ -0,0 +1,4 @@
+[white-space-collapsing-bidi-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
new file mode 100644
index 000000000000..0de1e513107a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-mixed-002.xht.ini
@@ -0,0 +1,4 @@
+[white-space-mixed-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
new file mode 100644
index 000000000000..902f50ab5487
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-001.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
new file mode 100644
index 000000000000..ba5241d90917
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-002.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
new file mode 100644
index 000000000000..1a4bdb220d07
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-003.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
new file mode 100644
index 000000000000..7925523b0960
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-004.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
new file mode 100644
index 000000000000..55bf71621432
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-005.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
new file mode 100644
index 000000000000..b5d088608f25
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-006.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
new file mode 100644
index 000000000000..104f6b7516bb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-007.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
new file mode 100644
index 000000000000..6716a58a2045
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-008.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
new file mode 100644
index 000000000000..7077dc942bcd
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-normal-009.xht.ini
@@ -0,0 +1,4 @@
+[white-space-normal-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
new file mode 100644
index 000000000000..0f2b407d8a4d
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-001.xht.ini
@@ -0,0 +1,4 @@
+[white-space-nowrap-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
new file mode 100644
index 000000000000..e6007f285c59
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-005.xht.ini
@@ -0,0 +1,4 @@
+[white-space-nowrap-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
new file mode 100644
index 000000000000..22c0ea83d4c0
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-nowrap-006.xht.ini
@@ -0,0 +1,4 @@
+[white-space-nowrap-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
new file mode 100644
index 000000000000..140e40ee5026
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-pre-001.xht.ini
@@ -0,0 +1,4 @@
+[white-space-pre-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
new file mode 100644
index 000000000000..cf79c7599581
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-pre-002.xht.ini
@@ -0,0 +1,4 @@
+[white-space-pre-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
new file mode 100644
index 000000000000..51aac6fa319b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-pre-005.xht.ini
@@ -0,0 +1,4 @@
+[white-space-pre-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
new file mode 100644
index 000000000000..6ae897994b77
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-pre-006.xht.ini
@@ -0,0 +1,4 @@
+[white-space-pre-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini b/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
new file mode 100644
index 000000000000..fbe05d0a25f1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/text/white-space-processing-049.xht.ini
@@ -0,0 +1,4 @@
+[white-space-processing-049.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
new file mode 100644
index 000000000000..3a5efb470642
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-001.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
new file mode 100644
index 000000000000..17156054d5b2
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-002.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
new file mode 100644
index 000000000000..516832efb0ed
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-003.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
new file mode 100644
index 000000000000..fdf506debbd6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-004.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
new file mode 100644
index 000000000000..1a33e664df2e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-005.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
new file mode 100644
index 000000000000..d783ae436934
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-006.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
new file mode 100644
index 000000000000..41dd877ac5ab
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-007.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
new file mode 100644
index 000000000000..237695b243cb
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-008.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
new file mode 100644
index 000000000000..0c06db22def1
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-009.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
new file mode 100644
index 000000000000..ffed90f150d8
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-012.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
new file mode 100644
index 000000000000..9cee9d8bae78
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-013.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
new file mode 100644
index 000000000000..911eaadde08c
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-014.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
new file mode 100644
index 000000000000..36cdc17040a7
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/ui/overflow-applies-to-015.xht.ini
@@ -0,0 +1,4 @@
+[overflow-applies-to-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
index 70d41f9fa3bd..5700eb1990e3 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-007.xht.ini
@@ -1,13 +1,4 @@
 [numbers-units-007.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
index 38d063e0e0b3..42a27e277a33 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-009.xht.ini
@@ -1,13 +1,4 @@
 [numbers-units-009.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
index 50d2a09ae522..ea27e1f6a071 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-010.xht.ini
@@ -1,13 +1,4 @@
 [numbers-units-010.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
new file mode 100644
index 000000000000..6562eb98cf1b
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-012.xht.ini
@@ -0,0 +1,3 @@
+[numbers-units-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
new file mode 100644
index 000000000000..0eaf6425013e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-013.xht.ini
@@ -0,0 +1,3 @@
+[numbers-units-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
new file mode 100644
index 000000000000..c8adb2fe5ecf
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-015.xht.ini
@@ -0,0 +1,3 @@
+[numbers-units-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
new file mode 100644
index 000000000000..68ec7ee56f1e
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-018.xht.ini
@@ -0,0 +1,3 @@
+[numbers-units-018.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
new file mode 100644
index 000000000000..63e3b794dc19
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-019.xht.ini
@@ -0,0 +1,3 @@
+[numbers-units-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
index f4b0d4579fac..f0946dfe4930 100644
--- a/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
+++ b/testing/web-platform/meta/css/CSS2/values/numbers-units-021.xht.ini
@@ -1,13 +1,4 @@
 [numbers-units-021.xht]
   expected:
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
-    if debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): FAIL
-    if not debug and not webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
+    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
diff --git a/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
new file mode 100644
index 000000000000..38c6504447cc
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-001.xht.ini
@@ -0,0 +1,3 @@
+[units-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
new file mode 100644
index 000000000000..53a68f8251ff
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-003.xht.ini
@@ -0,0 +1,3 @@
+[units-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
new file mode 100644
index 000000000000..7bfba9a530ca
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-004.xht.ini
@@ -0,0 +1,3 @@
+[units-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
new file mode 100644
index 000000000000..d93292d2e625
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-006.xht.ini
@@ -0,0 +1,3 @@
+[units-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
new file mode 100644
index 000000000000..f2bf98b9c037
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-008.xht.ini
@@ -0,0 +1,3 @@
+[units-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini b/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
new file mode 100644
index 000000000000..f681f9268a5a
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/values/units-009.xht.ini
@@ -0,0 +1,3 @@
+[units-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini b/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
new file mode 100644
index 000000000000..554dd5f9ab74
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/visufx/visibility-005.xht.ini
@@ -0,0 +1,4 @@
+[visibility-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini b/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
new file mode 100644
index 000000000000..7d86d413e717
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/visuren/anonymous-boxes-001a.xht.ini
@@ -0,0 +1,3 @@
+[anonymous-boxes-001a.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
new file mode 100644
index 000000000000..a35761851709
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-001.xht.ini
@@ -0,0 +1,4 @@
+[stack-floats-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
new file mode 100644
index 000000000000..02e56f98c527
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-002.xht.ini
@@ -0,0 +1,4 @@
+[stack-floats-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
new file mode 100644
index 000000000000..b9f726a8cec6
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-003.xht.ini
@@ -0,0 +1,4 @@
+[stack-floats-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
new file mode 100644
index 000000000000..3e4f47b5e4e5
--- /dev/null
+++ b/testing/web-platform/meta/css/CSS2/zindex/stack-floats-004.xht.ini
@@ -0,0 +1,4 @@
+[stack-floats-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
new file mode 100644
index 000000000000..7999e77446f7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-002.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
new file mode 100644
index 000000000000..0d580194368b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-003.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
new file mode 100644
index 000000000000..d5c877dd7758
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-004.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
new file mode 100644
index 000000000000..fd12e8af84cf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-009.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-009.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
new file mode 100644
index 000000000000..67c999b7c7ac
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-010.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
new file mode 100644
index 000000000000..6fbdb97af500
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-011.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
new file mode 100644
index 000000000000..787af28b796e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-012.html.ini
@@ -0,0 +1,3 @@
+[contain-layout-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
index 4cf049b8064a..19b5250abf58 100644
--- a/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
+++ b/testing/web-platform/meta/css/css-contain/contain-layout-018.html.ini
@@ -4,5 +4,3 @@
     if not debug and not webrender and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): FAIL
     if debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
     if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): FAIL
-    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
new file mode 100644
index 000000000000..b407ec30ea53
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-022.html.ini
@@ -0,0 +1,3 @@
+[contain-paint-022.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini b/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
new file mode 100644
index 000000000000..ff64ce7b2dde
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-paint-023.html.ini
@@ -0,0 +1,3 @@
+[contain-paint-023.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini b/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
new file mode 100644
index 000000000000..2e8785ab3d36
--- /dev/null
+++ b/testing/web-platform/meta/css/css-contain/contain-size-breaks-001.html.ini
@@ -0,0 +1,3 @@
+[contain-size-breaks-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini b/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
new file mode 100644
index 000000000000..c9c4a3cacdca
--- /dev/null
+++ b/testing/web-platform/meta/css/css-display/run-in/letter-spacing-applies-to-004.xht.ini
@@ -0,0 +1,4 @@
+[letter-spacing-applies-to-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini b/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
new file mode 100644
index 000000000000..5ed43bb8ed34
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/align-items-004.htm.ini
@@ -0,0 +1,4 @@
+[align-items-004.htm]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini b/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
new file mode 100644
index 000000000000..0080734e3ba3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/align-items-006.html.ini
@@ -0,0 +1,4 @@
+[align-items-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
new file mode 100644
index 000000000000..77111e740f3f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-001.xht.ini
@@ -0,0 +1,4 @@
+[flex-minimum-width-flex-items-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
new file mode 100644
index 000000000000..643966967cb2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/flex-minimum-width-flex-items-003.xht.ini
@@ -0,0 +1,4 @@
+[flex-minimum-width-flex-items-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini b/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
new file mode 100644
index 000000000000..1539b02ca965
--- /dev/null
+++ b/testing/web-platform/meta/css/css-flexbox/flexbox_flex-natural-mixed-basis-auto.html.ini
@@ -0,0 +1,4 @@
+[flexbox_flex-natural-mixed-basis-auto.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
new file mode 100644
index 000000000000..02bf202e2658
--- /dev/null
+++ b/testing/web-platform/meta/css/css-fonts/font-size-adjust-002.html.ini
@@ -0,0 +1,4 @@
+[font-size-adjust-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
new file mode 100644
index 000000000000..72406d1f52db
--- /dev/null
+++ b/testing/web-platform/meta/css/css-fonts/font-size-adjust-006.xht.ini
@@ -0,0 +1,4 @@
+[font-size-adjust-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
new file mode 100644
index 000000000000..8c7f95e9c82a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-fonts/font-size-adjust-007.xht.ini
@@ -0,0 +1,4 @@
+[font-size-adjust-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini b/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
new file mode 100644
index 000000000000..f6b6b6df0f34
--- /dev/null
+++ b/testing/web-platform/meta/css/css-fonts/font-size-adjust-008.xht.ini
@@ -0,0 +1,4 @@
+[font-size-adjust-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
new file mode 100644
index 000000000000..ddee9deeba62
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-001.html.ini
@@ -0,0 +1,3 @@
+[grid-self-baseline-changes-grid-area-size-001.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
new file mode 100644
index 000000000000..8ecd1710d754
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-004.html.ini
@@ -0,0 +1,3 @@
+[grid-self-baseline-changes-grid-area-size-004.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
new file mode 100644
index 000000000000..f5de535a1df6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/alignment/self-baseline/grid-self-baseline-changes-grid-area-size-005.html.ini
@@ -0,0 +1,3 @@
+[grid-self-baseline-changes-grid-area-size-005.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
new file mode 100644
index 000000000000..1ee1f916e573
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-columns-fit-content-001.html.ini
@@ -0,0 +1,4 @@
+[grid-template-columns-fit-content-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
new file mode 100644
index 000000000000..6dbbe0803085
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-definition/grid-template-rows-fit-content-001.html.ini
@@ -0,0 +1,4 @@
+[grid-template-rows-fit-content-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
new file mode 100644
index 000000000000..d2b5926f95d4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-items-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
new file mode 100644
index 000000000000..f78272882e29
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-002.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-items-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
new file mode 100644
index 000000000000..a7c66811dfff
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-items-003.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-items-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
new file mode 100644
index 000000000000..b9486431b513
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-auto-placement-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
new file mode 100644
index 000000000000..f095a85a6693
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-002.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-auto-placement-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
new file mode 100644
index 000000000000..0af58f89cfb6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-003.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-auto-placement-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
new file mode 100644
index 000000000000..4a5c190ed572
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-004.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-auto-placement-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
new file mode 100644
index 000000000000..11d843c245cf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-auto-placement-005.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-auto-placement-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
new file mode 100644
index 000000000000..77a54b6c8d07
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-painting-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
new file mode 100644
index 000000000000..6af7051fa353
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-002.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-painting-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
new file mode 100644
index 000000000000..8f7a44791f4d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-003.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-painting-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
new file mode 100644
index 000000000000..138b00b1f3ea
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-004.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-painting-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
new file mode 100644
index 000000000000..713545207e36
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-order-property-painting-005.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-order-property-painting-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
new file mode 100644
index 000000000000..250e778eec42
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
new file mode 100644
index 000000000000..a10df1f2c9a3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-002.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
new file mode 100644
index 000000000000..0e05e00ac083
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-003.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
new file mode 100644
index 000000000000..0ec898ebaf1a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-004.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
new file mode 100644
index 000000000000..e407f4c1177b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-005.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
new file mode 100644
index 000000000000..1b8b9aef213f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
new file mode 100644
index 000000000000..9c3cf0a9dd37
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-002.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
new file mode 100644
index 000000000000..575d500f8ccb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-003.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
new file mode 100644
index 000000000000..fa6339fd1e28
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-004.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
new file mode 100644
index 000000000000..25f4542c82fb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-005.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
new file mode 100644
index 000000000000..9bc27cdc78ef
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-inline-z-axis-ordering-overlapped-items-006.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-z-axis-ordering-overlapped-items-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
new file mode 100644
index 000000000000..da5ba687eae2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-001.html.ini
@@ -0,0 +1,4 @@
+[grid-items-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
new file mode 100644
index 000000000000..699aa8067689
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-002.html.ini
@@ -0,0 +1,4 @@
+[grid-items-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
new file mode 100644
index 000000000000..6c940f115938
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-items-003.html.ini
@@ -0,0 +1,4 @@
+[grid-items-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
new file mode 100644
index 000000000000..41048867d486
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-001.html.ini
@@ -0,0 +1,4 @@
+[grid-minimum-size-grid-items-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
new file mode 100644
index 000000000000..5ffe3bf2e5ea
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-minimum-size-grid-items-013.html.ini
@@ -0,0 +1,4 @@
+[grid-minimum-size-grid-items-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
new file mode 100644
index 000000000000..d07369bdd993
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-001.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-auto-placement-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
new file mode 100644
index 000000000000..9ca88b82c0f6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-002.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-auto-placement-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
new file mode 100644
index 000000000000..a7050789e400
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-003.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-auto-placement-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
new file mode 100644
index 000000000000..53217a44cdec
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-004.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-auto-placement-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
new file mode 100644
index 000000000000..4204226e9993
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-auto-placement-005.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-auto-placement-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
new file mode 100644
index 000000000000..34558e5239fd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-001.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-painting-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
new file mode 100644
index 000000000000..486e9a6cc039
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-002.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-painting-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
new file mode 100644
index 000000000000..14decb72bcce
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-003.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-painting-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
new file mode 100644
index 000000000000..1e17ab36a59b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-004.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-painting-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
new file mode 100644
index 000000000000..aba943193e59
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-order-property-painting-005.html.ini
@@ -0,0 +1,4 @@
+[grid-order-property-painting-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
new file mode 100644
index 000000000000..f3ea468270d2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-001.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
new file mode 100644
index 000000000000..ace8b311a070
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-002.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
new file mode 100644
index 000000000000..360fc666ea8e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-003.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
new file mode 100644
index 000000000000..07bc96b3fae3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-004.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
new file mode 100644
index 000000000000..7b9b07f40f83
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-005.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
new file mode 100644
index 000000000000..888e6d58b380
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-001.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
new file mode 100644
index 000000000000..e666c13580d8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-002.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
new file mode 100644
index 000000000000..61441e289f25
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-003.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
new file mode 100644
index 000000000000..7f23b2911d47
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-004.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
new file mode 100644
index 000000000000..5927d89f3310
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-005.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
new file mode 100644
index 000000000000..9b6a03ca566d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-items/grid-z-axis-ordering-overlapped-items-006.html.ini
@@ -0,0 +1,4 @@
+[grid-z-axis-ordering-overlapped-items-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
new file mode 100644
index 000000000000..cefea58027f9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-model/grid-display-grid-001.html.ini
@@ -0,0 +1,4 @@
+[grid-display-grid-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
new file mode 100644
index 000000000000..8f955b9ab0b8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-model/grid-inline-vertical-align-001.html.ini
@@ -0,0 +1,4 @@
+[grid-inline-vertical-align-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini b/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
new file mode 100644
index 000000000000..8b720f497199
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/grid-model/grid-vertical-align-001.html.ini
@@ -0,0 +1,4 @@
+[grid-vertical-align-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
new file mode 100644
index 000000000000..dac72b44c828
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-filled-shrinkwrap-001.html.ini
@@ -0,0 +1,4 @@
+[grid-percent-cols-filled-shrinkwrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
new file mode 100644
index 000000000000..91d4e9378071
--- /dev/null
+++ b/testing/web-platform/meta/css/css-grid/layout-algorithm/grid-percent-cols-spanned-shrinkwrap-001.html.ini
@@ -0,0 +1,4 @@
+[grid-percent-cols-spanned-shrinkwrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
new file mode 100644
index 000000000000..661a6ae39c59
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-basic-001.html.ini
@@ -0,0 +1,3 @@
+[multicol-basic-001.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
new file mode 100644
index 000000000000..88b4413982c3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-basic-002.html.ini
@@ -0,0 +1,3 @@
+[multicol-basic-002.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
new file mode 100644
index 000000000000..7c1504077126
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-basic-003.html.ini
@@ -0,0 +1,3 @@
+[multicol-basic-003.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
new file mode 100644
index 000000000000..af41d8a8dcaf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-basic-004.html.ini
@@ -0,0 +1,3 @@
+[multicol-basic-004.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
new file mode 100644
index 000000000000..71ed8b062aba
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-block-no-clip-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
new file mode 100644
index 000000000000..e3f0e248fc07
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-block-no-clip-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-block-no-clip-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
new file mode 100644
index 000000000000..7176a5b24183
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-clip-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-clip-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
new file mode 100644
index 000000000000..89c756dd4a61
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-clip-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-clip-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
new file mode 100644
index 000000000000..5477a6a431fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-collapsing-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-collapsing-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
new file mode 100644
index 000000000000..2decedec7de6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
new file mode 100644
index 000000000000..b05adb6bc418
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
new file mode 100644
index 000000000000..d34d3fcdc8e3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
new file mode 100644
index 000000000000..7e8b1b612f73
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-004.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
new file mode 100644
index 000000000000..79d012d08240
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-005.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
new file mode 100644
index 000000000000..9a7793204ae3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-006.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-006.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
new file mode 100644
index 000000000000..69c790ff65fa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-007.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-007.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
new file mode 100644
index 000000000000..b8aeda0a9df2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-invalid-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
new file mode 100644
index 000000000000..64bec1f10b0c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-invalid-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-invalid-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
new file mode 100644
index 000000000000..c6ae4cb18418
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-columns-toolong-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-columns-toolong-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
new file mode 100644
index 000000000000..686d4a3faac7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-containing-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-containing-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
new file mode 100644
index 000000000000..bd346a3f180f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-containing-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-containing-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
new file mode 100644
index 000000000000..19a50721388c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
new file mode 100644
index 000000000000..7925f06137b7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
new file mode 100644
index 000000000000..8e19b0b1c24b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-computed-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
new file mode 100644
index 000000000000..c77515421e9b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-004.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-computed-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
new file mode 100644
index 000000000000..eeeda7e5732b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-computed-005.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-computed-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
new file mode 100644
index 000000000000..8a4c287b1cae
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-negative-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
new file mode 100644
index 000000000000..004ceb9b0428
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-negative-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-negative-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
new file mode 100644
index 000000000000..7066d81ead81
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-non-integer-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
new file mode 100644
index 000000000000..ef9e0f199a0b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-non-integer-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
new file mode 100644
index 000000000000..a3147f6715a3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-count-non-integer-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-count-non-integer-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
new file mode 100644
index 000000000000..16b7e1278340
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-fill-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
new file mode 100644
index 000000000000..4a351718d8f7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-fill-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
new file mode 100644
index 000000000000..030298c9c8f0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-fill-auto-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
new file mode 100644
index 000000000000..97c6a8333083
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-auto-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-fill-auto-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
new file mode 100644
index 000000000000..a189fc87db27
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-fill-balance-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-fill-balance-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
new file mode 100644
index 000000000000..499aa1362b30
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
new file mode 100644
index 000000000000..cca2892b462d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
new file mode 100644
index 000000000000..296549ae7af8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
new file mode 100644
index 000000000000..d27716b867fa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
new file mode 100644
index 000000000000..1caf97bb0e8e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-fraction-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-fraction-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
new file mode 100644
index 000000000000..5edae168dffb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-large-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
new file mode 100644
index 000000000000..bb760ee1c49e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-large-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-large-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
new file mode 100644
index 000000000000..c52592a14eca
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-gap-negative-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-gap-negative-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
new file mode 100644
index 000000000000..d633be264028
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-height-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-height-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
new file mode 100644
index 000000000000..d49a5286c591
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-inherit-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-inherit-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
new file mode 100644
index 000000000000..35c8ed158ad0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-inherit-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-inherit-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
new file mode 100644
index 000000000000..5f73ce06f3c2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-margin-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-margin-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
new file mode 100644
index 000000000000..cc6188ab38b9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-margin-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-margin-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
new file mode 100644
index 000000000000..2ab9913daf47
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-margin-child-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-margin-child-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
new file mode 100644
index 000000000000..7c6716e74e08
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
new file mode 100644
index 000000000000..f1f88ea94840
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-005.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
new file mode 100644
index 000000000000..3727be9c6e19
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-margin-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
new file mode 100644
index 000000000000..2716a943264e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-margin-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
new file mode 100644
index 000000000000..7ef03e9d7412
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-margin-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
new file mode 100644
index 000000000000..27ffe2ae64cf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-004.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-margin-004.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
new file mode 100644
index 000000000000..a32d8a639284
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-nested-margin-005.xht.ini
@@ -0,0 +1,3 @@
+[multicol-nested-margin-005.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
new file mode 100644
index 000000000000..b9f986759b6a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-overflowing-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-overflowing-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
new file mode 100644
index 000000000000..604198c1a126
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-reduce-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-reduce-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
new file mode 100644
index 000000000000..7dc322c85ed5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
new file mode 100644
index 000000000000..4f5d50f8525f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
new file mode 100644
index 000000000000..3721d9a153b4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
new file mode 100644
index 000000000000..e356017f507f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
new file mode 100644
index 000000000000..311013bf6591
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-color-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
new file mode 100644
index 000000000000..abb2b1686da1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-color-inherit-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
new file mode 100644
index 000000000000..1599b5e7671e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-color-inherit-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-color-inherit-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
new file mode 100644
index 000000000000..b4ffc5afc604
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-dashed-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-dashed-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
new file mode 100644
index 000000000000..9926e477248a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-dotted-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-dotted-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
new file mode 100644
index 000000000000..551887898d92
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-double-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-double-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
new file mode 100644
index 000000000000..0ec07d1d2b26
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-fraction-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
new file mode 100644
index 000000000000..8acd4c7884b3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-fraction-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
new file mode 100644
index 000000000000..5549ee75a169
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-fraction-003.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-fraction-003.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
new file mode 100644
index 000000000000..f1ddbe8439b4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-groove-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-groove-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
new file mode 100644
index 000000000000..005aaf4f4ae0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-inset-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-inset-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
new file mode 100644
index 000000000000..974cc555ebe8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-large-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-large-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
new file mode 100644
index 000000000000..97a62ace6427
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-outset-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-outset-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
new file mode 100644
index 000000000000..6839e0449b91
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-percent-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-percent-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
new file mode 100644
index 000000000000..11064dd345c5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-px-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-px-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
new file mode 100644
index 000000000000..dd1cd3fcb880
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-ridge-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-ridge-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
new file mode 100644
index 000000000000..175a98c77ec5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-shorthand-2.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-shorthand-2.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
new file mode 100644
index 000000000000..37da08a114ba
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-solid-000.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-solid-000.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
new file mode 100644
index 000000000000..ed102d9eabdb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-rule-stacking-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-rule-stacking-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
new file mode 100644
index 000000000000..4b627f7c43d6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-shorthand-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-shorthand-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
new file mode 100644
index 000000000000..538c4a9d68d4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-none-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-span-none-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
new file mode 100644
index 000000000000..44d2d8cb57bb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
new file mode 100644
index 000000000000..0668d92d1210
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
new file mode 100644
index 000000000000..d15189a26435
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-count-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-count-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
new file mode 100644
index 000000000000..a1761f54e00e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-count-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-count-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
new file mode 100644
index 000000000000..198e8066483b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-invalid-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-invalid-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
new file mode 100644
index 000000000000..622447c429cd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-large-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-large-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
new file mode 100644
index 000000000000..71af763bedd6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-large-002.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-large-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
new file mode 100644
index 000000000000..91c107f0a6c9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-width-negative-001.xht.ini
@@ -0,0 +1,3 @@
+[multicol-width-negative-001.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini b/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
new file mode 100644
index 000000000000..449578b7202e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-position/position-sticky-inline.html.ini
@@ -0,0 +1,3 @@
+[position-sticky-inline.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini b/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
new file mode 100644
index 000000000000..70ed4bc89436
--- /dev/null
+++ b/testing/web-platform/meta/css/css-position/position-sticky-nested-inline.html.ini
@@ -0,0 +1,3 @@
+[position-sticky-nested-inline.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini b/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
index 47f83be1626c..e4612c1fb304 100644
--- a/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
+++ b/testing/web-platform/meta/css/css-pseudo/marker-inherit-line-height.html.ini
@@ -1,4 +1,3 @@
 [marker-inherit-line-height.html]
   expected:
     if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-    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): FAIL
diff --git a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
new file mode 100644
index 000000000000..95fee2d29841
--- /dev/null
+++ b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-002.html.ini
@@ -0,0 +1,4 @@
+[regions-resizing-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
new file mode 100644
index 000000000000..8fcee74c3ac7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-regions/interactivity/resizing/regions-resizing-004.html.ini
@@ -0,0 +1,4 @@
+[regions-resizing-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
new file mode 100644
index 000000000000..7893792b6b56
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-002.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
new file mode 100644
index 000000000000..d17b4377edfc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-003.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
new file mode 100644
index 000000000000..7afff5c19a3c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-004.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
new file mode 100644
index 000000000000..6e17ca1acca3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-006.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
new file mode 100644
index 000000000000..30f4e6afcb4d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-007.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
new file mode 100644
index 000000000000..a74a9cd7100c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-008.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-008.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
new file mode 100644
index 000000000000..a1d5b3d37317
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-box/shape-outside-box-009.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-box-009.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
new file mode 100644
index 000000000000..6e8f2d2f810d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-000.html.ini
@@ -0,0 +1,4 @@
+[shape-image-000.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
new file mode 100644
index 000000000000..db12d303726e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-001.html.ini
@@ -0,0 +1,4 @@
+[shape-image-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
new file mode 100644
index 000000000000..c2c8bd6a0263
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-002.html.ini
@@ -0,0 +1,4 @@
+[shape-image-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
new file mode 100644
index 000000000000..e48d5cca19ea
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-003.html.ini
@@ -0,0 +1,4 @@
+[shape-image-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
new file mode 100644
index 000000000000..9189cda390ed
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-004.html.ini
@@ -0,0 +1,4 @@
+[shape-image-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
new file mode 100644
index 000000000000..fe076673e6ce
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-005.html.ini
@@ -0,0 +1,4 @@
+[shape-image-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
new file mode 100644
index 000000000000..73a6832b1c4e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-006.html.ini
@@ -0,0 +1,4 @@
+[shape-image-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
new file mode 100644
index 000000000000..52b97fb12f08
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-007.html.ini
@@ -0,0 +1,4 @@
+[shape-image-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
new file mode 100644
index 000000000000..465ac4a6424e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-008.html.ini
@@ -0,0 +1,4 @@
+[shape-image-008.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
new file mode 100644
index 000000000000..5f0fff4af6a6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-009.html.ini
@@ -0,0 +1,4 @@
+[shape-image-009.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
new file mode 100644
index 000000000000..2fc9244b10bd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-010.html.ini
@@ -0,0 +1,4 @@
+[shape-image-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
new file mode 100644
index 000000000000..7497ee317f0f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-011.html.ini
@@ -0,0 +1,4 @@
+[shape-image-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
new file mode 100644
index 000000000000..e717c4c5f8aa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-012.html.ini
@@ -0,0 +1,4 @@
+[shape-image-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
new file mode 100644
index 000000000000..2abc378cdf0f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-013.html.ini
@@ -0,0 +1,4 @@
+[shape-image-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
new file mode 100644
index 000000000000..89e1dbfc3f7c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-014.html.ini
@@ -0,0 +1,4 @@
+[shape-image-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
new file mode 100644
index 000000000000..38bb0156c399
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-015.html.ini
@@ -0,0 +1,4 @@
+[shape-image-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
new file mode 100644
index 000000000000..dfa75396ce7b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-016.html.ini
@@ -0,0 +1,4 @@
+[shape-image-016.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
new file mode 100644
index 000000000000..dd6481439e73
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-017.html.ini
@@ -0,0 +1,4 @@
+[shape-image-017.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
new file mode 100644
index 000000000000..da3ecf575f3b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-018.html.ini
@@ -0,0 +1,4 @@
+[shape-image-018.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
new file mode 100644
index 000000000000..a2b56d8dde0b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-019.html.ini
@@ -0,0 +1,4 @@
+[shape-image-019.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
new file mode 100644
index 000000000000..0505a3e98741
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-020.html.ini
@@ -0,0 +1,4 @@
+[shape-image-020.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
new file mode 100644
index 000000000000..87558c84caa7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-021.html.ini
@@ -0,0 +1,4 @@
+[shape-image-021.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
new file mode 100644
index 000000000000..7033ecd1a8cf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-022.html.ini
@@ -0,0 +1,4 @@
+[shape-image-022.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
new file mode 100644
index 000000000000..1f602cf25af5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-023.html.ini
@@ -0,0 +1,4 @@
+[shape-image-023.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
new file mode 100644
index 000000000000..170ee2851da1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-025.html.ini
@@ -0,0 +1,4 @@
+[shape-image-025.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
new file mode 100644
index 000000000000..62250081d6fd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-026.html.ini
@@ -0,0 +1,4 @@
+[shape-image-026.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
new file mode 100644
index 000000000000..f8c1895ef99d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/shape-image/shape-image-027.html.ini
@@ -0,0 +1,4 @@
+[shape-image-027.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
new file mode 100644
index 000000000000..d321faadf28a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
new file mode 100644
index 000000000000..6b4286e59eed
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-014.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
new file mode 100644
index 000000000000..7da471bc8833
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-015.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
new file mode 100644
index 000000000000..0b2cd4a187c2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-016.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-016.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
new file mode 100644
index 000000000000..7c26f7958617
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-017.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-017.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
new file mode 100644
index 000000000000..88f7252b0796
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-018.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-018.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
new file mode 100644
index 000000000000..99434338093d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-019.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-019.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
new file mode 100644
index 000000000000..3a06bf7e5db8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-020.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-020.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
new file mode 100644
index 000000000000..3ca921ebecef
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-021.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-021.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
new file mode 100644
index 000000000000..2324bcdb3c8d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-022.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-022.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
new file mode 100644
index 000000000000..e93d36282cda
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-024.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-024.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
new file mode 100644
index 000000000000..a2209466410d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-025.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-025.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
new file mode 100644
index 000000000000..88bae43033a8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-026.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-026.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
new file mode 100644
index 000000000000..701f626b6bd9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-027.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-027.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
new file mode 100644
index 000000000000..3fc928715b74
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-028.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-028.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
new file mode 100644
index 000000000000..82ebcaabedb7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-029.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-circle-029.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
new file mode 100644
index 000000000000..7af4e0c9b670
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-013.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
new file mode 100644
index 000000000000..6813daf91afc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-014.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
new file mode 100644
index 000000000000..d5630c6981cb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-015.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
new file mode 100644
index 000000000000..fe4c801a18dd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-016.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-016.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
new file mode 100644
index 000000000000..85fd53a577ff
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-017.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-017.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
new file mode 100644
index 000000000000..e86a4e0fbb7c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-018.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-018.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
new file mode 100644
index 000000000000..fba13ae8ebce
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-019.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-019.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
new file mode 100644
index 000000000000..01843144e829
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-020.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-020.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
new file mode 100644
index 000000000000..71e4ac9bca21
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-021.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-021.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
new file mode 100644
index 000000000000..435779e9ed54
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-022.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-022.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
new file mode 100644
index 000000000000..faf09b156b0f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-023.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-023.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
new file mode 100644
index 000000000000..32e9e571c7b5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-024.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-024.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
new file mode 100644
index 000000000000..8b2548f012a3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-025.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-ellipse-025.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
new file mode 100644
index 000000000000..3b05372f9698
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-010.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
new file mode 100644
index 000000000000..89648f788fb1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-011.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
new file mode 100644
index 000000000000..803ce8ad2c6c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-012.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
new file mode 100644
index 000000000000..279c03ac165e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-013.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
new file mode 100644
index 000000000000..e5495fdddb9a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-014.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
new file mode 100644
index 000000000000..733f82f62895
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-015.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
new file mode 100644
index 000000000000..83baddd95b3d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-028.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-028.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
new file mode 100644
index 000000000000..bf44fd50a163
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-029.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
new file mode 100644
index 000000000000..71da0e70b1ff
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-inset-030.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
new file mode 100644
index 000000000000..e3cba4dc8cf2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
new file mode 100644
index 000000000000..0838d13b4bf9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-008.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-008.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
new file mode 100644
index 000000000000..32f008cbd651
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-009.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-009.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
new file mode 100644
index 000000000000..1f02aeb1a283
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-010.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
new file mode 100644
index 000000000000..8cb42392b4f9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-011.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
new file mode 100644
index 000000000000..2a08cb567fdb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-012.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
new file mode 100644
index 000000000000..59f4f1a2a64b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-013.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
new file mode 100644
index 000000000000..c7ce8180be26
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-014.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
new file mode 100644
index 000000000000..55845330d50a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-015.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
new file mode 100644
index 000000000000..384b3c4744c3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-016.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-016.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
new file mode 100644
index 000000000000..6cfa74f4353a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-polygon-017.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
new file mode 100644
index 000000000000..95959d6c1d98
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-001.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
new file mode 100644
index 000000000000..0c658180b568
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-002.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
new file mode 100644
index 000000000000..df74f7d3140e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-003.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
new file mode 100644
index 000000000000..3648f963777e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-005.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
new file mode 100644
index 000000000000..d853d83435b7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-006.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
new file mode 100644
index 000000000000..54a0084846bb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-shapes/spec-examples/shape-outside-007.html.ini
@@ -0,0 +1,4 @@
+[shape-outside-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
new file mode 100644
index 000000000000..ddcc188cb6f6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-001.html.ini
@@ -0,0 +1,3 @@
+[intrinsic-percent-non-replaced-001.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
new file mode 100644
index 000000000000..6e04045ae0d6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-sizing/intrinsic-percent-non-replaced-003.html.ini
@@ -0,0 +1,3 @@
+[intrinsic-percent-non-replaced-003.html]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
new file mode 100644
index 000000000000..fe42e31b2167
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-001.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
new file mode 100644
index 000000000000..6a0f1e51e01f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-002.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
new file mode 100644
index 000000000000..f7c3cfd6891a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-003.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
new file mode 100644
index 000000000000..e59d1eeca186
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-004.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
new file mode 100644
index 000000000000..82270c204d76
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-005.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
new file mode 100644
index 000000000000..bf4e3fb154c1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-006.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
new file mode 100644
index 000000000000..b6b5df5945b8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-007.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
new file mode 100644
index 000000000000..359bd78262f4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-008.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-008.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
new file mode 100644
index 000000000000..03285108067e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-009.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-009.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
new file mode 100644
index 000000000000..aa7cef46afdf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-010.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
new file mode 100644
index 000000000000..e73cbd449107
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-011.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
new file mode 100644
index 000000000000..4bcb2e600cb5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-012.html.ini
@@ -0,0 +1,4 @@
+[line-breaking-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
new file mode 100644
index 000000000000..59d9dcc6dee9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-001.html.ini
@@ -0,0 +1,3 @@
+[overflow-wrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
new file mode 100644
index 000000000000..c44cfd38b3e8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-002.html.ini
@@ -0,0 +1,3 @@
+[overflow-wrap-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
new file mode 100644
index 000000000000..6d09beeb6137
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-003.html.ini
@@ -0,0 +1,3 @@
+[overflow-wrap-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
new file mode 100644
index 000000000000..4d5bd2588965
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-005.html.ini
@@ -0,0 +1,3 @@
+[overflow-wrap-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
new file mode 100644
index 000000000000..b5ecfd04622f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-001.html.ini
@@ -0,0 +1,3 @@
+[word-wrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
new file mode 100644
index 000000000000..056b7d3d9158
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-002.html.ini
@@ -0,0 +1,3 @@
+[word-wrap-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
new file mode 100644
index 000000000000..1bd1d3e71f64
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-003.html.ini
@@ -0,0 +1,3 @@
+[word-wrap-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
new file mode 100644
index 000000000000..06f25e78391c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/overflow-wrap/word-wrap-005.html.ini
@@ -0,0 +1,3 @@
+[word-wrap-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
new file mode 100644
index 000000000000..bcce71e4d95a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/break-spaces-002.html.ini
@@ -0,0 +1,4 @@
+[break-spaces-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
new file mode 100644
index 000000000000..24dbdfda0193
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-001.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
new file mode 100644
index 000000000000..4bede7320c15
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-002.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
new file mode 100644
index 000000000000..196c91905751
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-003.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
new file mode 100644
index 000000000000..a37ca94a977c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-004.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
new file mode 100644
index 000000000000..f624737aa0ac
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-005.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
new file mode 100644
index 000000000000..952091841388
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-006.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
new file mode 100644
index 000000000000..06920af0a7ce
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-007.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
new file mode 100644
index 000000000000..7345d4f018e2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-011.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
new file mode 100644
index 000000000000..7fd8fe8a9119
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-012.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
new file mode 100644
index 000000000000..570bbc69d9c9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-013.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
new file mode 100644
index 000000000000..73938029c158
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/pre-wrap-014.html.ini
@@ -0,0 +1,4 @@
+[pre-wrap-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
new file mode 100644
index 000000000000..a531e7c1f80e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-break-spaces-002.html.ini
@@ -0,0 +1,4 @@
+[textarea-break-spaces-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
new file mode 100644
index 000000000000..eed15c0626d0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-001.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
new file mode 100644
index 000000000000..9228ded5429a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-002.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
new file mode 100644
index 000000000000..6025fcd6945b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-003.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
new file mode 100644
index 000000000000..f3a7421f6442
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-004.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
new file mode 100644
index 000000000000..6af32287b0fb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-005.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-005.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
new file mode 100644
index 000000000000..1eac68668071
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-006.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-006.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
new file mode 100644
index 000000000000..054192808d5a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-007.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
new file mode 100644
index 000000000000..61090c13d6e7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-011.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
new file mode 100644
index 000000000000..993dc5c2d0df
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-012.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-012.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
new file mode 100644
index 000000000000..785f31b16bf9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-013.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
new file mode 100644
index 000000000000..050795092711
--- /dev/null
+++ b/testing/web-platform/meta/css/css-text/white-space/textarea-pre-wrap-014.html.ini
@@ -0,0 +1,4 @@
+[textarea-pre-wrap-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini b/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
new file mode 100644
index 000000000000..c31ebad21a3b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-transforms/transform-applies-to-002.xht.ini
@@ -0,0 +1,3 @@
+[transform-applies-to-002.xht]
+  expected:
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/outline-004.html.ini b/testing/web-platform/meta/css/css-ui/outline-004.html.ini
new file mode 100644
index 000000000000..e764f96e380f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/outline-004.html.ini
@@ -0,0 +1,4 @@
+[outline-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
new file mode 100644
index 000000000000..50a98f396772
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-001.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
new file mode 100644
index 000000000000..88f28edf5479
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-002.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-002.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
new file mode 100644
index 000000000000..b9de1cfaad54
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-003.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-003.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
new file mode 100644
index 000000000000..6b6e2b4e7d48
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-004.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-004.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
new file mode 100644
index 000000000000..b7399df116ca
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-007.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-007.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
new file mode 100644
index 000000000000..248f72f406e4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-010.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-010.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
new file mode 100644
index 000000000000..4c198e282be8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-011.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-011.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
new file mode 100644
index 000000000000..ff57afdea067
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-013.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-013.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
new file mode 100644
index 000000000000..3922a7aeaee5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-014.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-014.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
new file mode 100644
index 000000000000..1a6e0123d785
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-015.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-015.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
new file mode 100644
index 000000000000..9126d02ed318
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-016.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-016.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini b/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
new file mode 100644
index 000000000000..8cb86a7d3ba7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-ui/text-overflow-020.html.ini
@@ -0,0 +1,4 @@
+[text-overflow-020.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini b/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
new file mode 100644
index 000000000000..f8930e5f7fd1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-variables/vars-font-shorthand-001.html.ini
@@ -0,0 +1,4 @@
+[vars-font-shorthand-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
new file mode 100644
index 000000000000..a0e90c127819
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
new file mode 100644
index 000000000000..477a2e885776
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
new file mode 100644
index 000000000000..5fb319dbef83
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-009.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
new file mode 100644
index 000000000000..4825f658c0f9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-011.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
new file mode 100644
index 000000000000..881ef49fc1fa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-015.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
new file mode 100644
index 000000000000..5f2d048505b7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
new file mode 100644
index 000000000000..4e5e3fc50423
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-021.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-021.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
new file mode 100644
index 000000000000..4c8eed8c90bc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-023.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-023.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
new file mode 100644
index 000000000000..db958a541be6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-027.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-027.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
new file mode 100644
index 000000000000..61e6a5188a19
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-029.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
new file mode 100644
index 000000000000..f14bdff33b59
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-033.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-033.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
new file mode 100644
index 000000000000..c72dbc63f213
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-035.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-035.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
new file mode 100644
index 000000000000..53b4a0db3b20
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-039.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-039.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
new file mode 100644
index 000000000000..faf979030585
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-041.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
new file mode 100644
index 000000000000..25b66ffd9b14
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-045.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-045.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
new file mode 100644
index 000000000000..f4d55003e652
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-047.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-047.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
new file mode 100644
index 000000000000..2d1557dd4809
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-051.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-051.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
new file mode 100644
index 000000000000..f41e134fe3b0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-053.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
new file mode 100644
index 000000000000..9c0b5bd82482
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-057.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-057.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
new file mode 100644
index 000000000000..c175e8169420
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-059.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-059.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
new file mode 100644
index 000000000000..8e7d46e17fdf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-063.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-063.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
new file mode 100644
index 000000000000..d54173f2a3f3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-065.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
new file mode 100644
index 000000000000..0e256a5163b4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-069.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-069.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
new file mode 100644
index 000000000000..1dd94425beee
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-071.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-071.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
new file mode 100644
index 000000000000..998ae6424701
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-075.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-075.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
new file mode 100644
index 000000000000..b7e34c466f5e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-077.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
new file mode 100644
index 000000000000..57deec08783a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-081.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-081.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
new file mode 100644
index 000000000000..7324aa6873ba
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-083.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-083.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
new file mode 100644
index 000000000000..5193245373aa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-087.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-087.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
new file mode 100644
index 000000000000..f19921250af5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-089.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
new file mode 100644
index 000000000000..ded6fee05a92
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-093.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-093.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
new file mode 100644
index 000000000000..5698373d32b8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-095.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
new file mode 100644
index 000000000000..665a776425cd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-103.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-103.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
new file mode 100644
index 000000000000..7a2f078ab922
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-105.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
new file mode 100644
index 000000000000..675d546652d8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-109.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
new file mode 100644
index 000000000000..20e282424d96
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-111.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-111.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
new file mode 100644
index 000000000000..1bba1f584157
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-113.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-113.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
new file mode 100644
index 000000000000..20d1aa59b067
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-117.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-117.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
new file mode 100644
index 000000000000..f9e4627916f9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-119.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-119.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
new file mode 100644
index 000000000000..0df3ceb47e8e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-121.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
new file mode 100644
index 000000000000..ee47c517469b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-125.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
new file mode 100644
index 000000000000..34d3c374b49e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-127.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-127.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
new file mode 100644
index 000000000000..62fb5eff609d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-129.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-129.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
new file mode 100644
index 000000000000..531ad8df1192
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-133.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-133.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
new file mode 100644
index 000000000000..a8759d335de2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-135.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-135.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
new file mode 100644
index 000000000000..520eb6d23737
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-137.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
new file mode 100644
index 000000000000..0e42660fec11
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-141.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
new file mode 100644
index 000000000000..d135a395388c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-143.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-143.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
new file mode 100644
index 000000000000..8b574992f644
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-145.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-145.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
new file mode 100644
index 000000000000..087452da6ab8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-149.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-149.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
new file mode 100644
index 000000000000..5f073070c8ab
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-151.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-151.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
new file mode 100644
index 000000000000..09917204d94a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-153.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
new file mode 100644
index 000000000000..ccf7f1c0b780
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-157.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
new file mode 100644
index 000000000000..d053c1263eef
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-159.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-159.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
new file mode 100644
index 000000000000..733df616890f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-161.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-161.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
new file mode 100644
index 000000000000..31908b958ca1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-165.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-165.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
new file mode 100644
index 000000000000..a410332b0f70
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-167.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-167.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
new file mode 100644
index 000000000000..50c29d9eff63
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-169.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
new file mode 100644
index 000000000000..589cf1cc64b9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-173.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
new file mode 100644
index 000000000000..aa47b3f183eb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-175.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-175.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
new file mode 100644
index 000000000000..8d54a0c2e3c1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-177.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-177.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
new file mode 100644
index 000000000000..ea8f7dedfe6e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-181.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-181.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
new file mode 100644
index 000000000000..7a4dede2f2a0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-183.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-183.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
new file mode 100644
index 000000000000..589f8419b748
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-185.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
new file mode 100644
index 000000000000..a215faeefe94
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-189.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
new file mode 100644
index 000000000000..155f7c693094
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-191.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-191.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
new file mode 100644
index 000000000000..c1235b7be607
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-193.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-193.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
new file mode 100644
index 000000000000..5732d1c4a52d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-197.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-197.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
new file mode 100644
index 000000000000..ab988402025f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-199.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-199.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
new file mode 100644
index 000000000000..87a18d525cda
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-201.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
new file mode 100644
index 000000000000..08269ef2aad8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-205.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
new file mode 100644
index 000000000000..6f0e2c3e3f75
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-207.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-207.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
new file mode 100644
index 000000000000..39dfb550fbd5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-209.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-209.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
new file mode 100644
index 000000000000..82a591ffbc29
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-213.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-213.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
new file mode 100644
index 000000000000..6b1458b49949
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-215.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-215.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
new file mode 100644
index 000000000000..fdd77f06afa8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-217.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
new file mode 100644
index 000000000000..92bbe428f09c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-221.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
new file mode 100644
index 000000000000..970e0e62cb3d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-223.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-223.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
new file mode 100644
index 000000000000..1002ed819485
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-225.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
new file mode 100644
index 000000000000..5401423e85ac
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vlr-229.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
new file mode 100644
index 000000000000..77628887a99e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
new file mode 100644
index 000000000000..fe91f9998a22
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
new file mode 100644
index 000000000000..df7c6aae3dde
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-008.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
new file mode 100644
index 000000000000..c87e2b70df79
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-010.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
new file mode 100644
index 000000000000..4997d8fcdfda
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-014.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
new file mode 100644
index 000000000000..9939999d54bd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
new file mode 100644
index 000000000000..97a3f41b33be
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-020.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
new file mode 100644
index 000000000000..ab0264565a58
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-022.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-022.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
new file mode 100644
index 000000000000..7e306eac904d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-026.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-026.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
new file mode 100644
index 000000000000..c8c2dae330bd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-028.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
new file mode 100644
index 000000000000..ff9155388244
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-032.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-032.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
new file mode 100644
index 000000000000..1d149ad167f1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-034.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
new file mode 100644
index 000000000000..15dcc952ce90
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-038.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-038.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
new file mode 100644
index 000000000000..15279c458b53
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-040.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
new file mode 100644
index 000000000000..c2ebb74fa659
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-044.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-044.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
new file mode 100644
index 000000000000..68e84fdd24a9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-046.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-046.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
new file mode 100644
index 000000000000..146860ce119c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-050.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-050.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
new file mode 100644
index 000000000000..48d23dda78b6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-052.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
new file mode 100644
index 000000000000..95a8e4eaea86
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-056.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-056.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
new file mode 100644
index 000000000000..a00892b6dc53
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-058.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-058.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
new file mode 100644
index 000000000000..feb844c9ea92
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-062.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-062.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
new file mode 100644
index 000000000000..2b7d16ae94c1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-064.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
new file mode 100644
index 000000000000..f1e9f1d88c26
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-068.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-068.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
new file mode 100644
index 000000000000..da1b9838f44a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-070.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-070.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
new file mode 100644
index 000000000000..126425d0dd91
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-074.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-074.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
new file mode 100644
index 000000000000..ca7169863354
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-076.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
new file mode 100644
index 000000000000..71df81237d19
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-080.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-080.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
new file mode 100644
index 000000000000..8da8ab32af30
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-082.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-082.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
new file mode 100644
index 000000000000..d0d903efeb99
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-086.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-086.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
new file mode 100644
index 000000000000..a4074afb58a1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-088.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
new file mode 100644
index 000000000000..3ad7d37d838e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-092.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-092.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
new file mode 100644
index 000000000000..8d801bdb3b2f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-094.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-094.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
new file mode 100644
index 000000000000..dc6151148d44
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-102.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-102.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
new file mode 100644
index 000000000000..0ba070ebd8f4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-104.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
new file mode 100644
index 000000000000..88e8ba0c0f63
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-108.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
new file mode 100644
index 000000000000..8f18a1f631a2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-110.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-110.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
new file mode 100644
index 000000000000..c79f7d5e8585
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-112.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
new file mode 100644
index 000000000000..477b02dd5a9c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-116.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
new file mode 100644
index 000000000000..b5ecbb511e72
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-118.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-118.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
new file mode 100644
index 000000000000..3db7ee989730
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-120.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-120.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
new file mode 100644
index 000000000000..8fe3f3cf405b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-124.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
new file mode 100644
index 000000000000..c377bac1a23e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-126.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-126.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
new file mode 100644
index 000000000000..eecf28cbf1e4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-128.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
new file mode 100644
index 000000000000..1d3552cfe355
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-132.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-132.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
new file mode 100644
index 000000000000..06a0a56d0f6c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-134.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-134.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
new file mode 100644
index 000000000000..66b954b974e9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-136.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
new file mode 100644
index 000000000000..28bce9d51e03
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-140.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
new file mode 100644
index 000000000000..37734b339195
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-142.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-142.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
new file mode 100644
index 000000000000..6a5b0a46d57f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-144.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
new file mode 100644
index 000000000000..13c2323f74c1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-148.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
new file mode 100644
index 000000000000..15b7b04423d6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-150.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-150.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
new file mode 100644
index 000000000000..03ac77b089d5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-152.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-152.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
new file mode 100644
index 000000000000..5a85b287155e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-156.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
new file mode 100644
index 000000000000..a5ef150acc3a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-158.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-158.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
new file mode 100644
index 000000000000..8b66003798b0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-160.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
new file mode 100644
index 000000000000..51372950ad40
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-164.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-164.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
new file mode 100644
index 000000000000..080493e778b9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-166.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-166.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
new file mode 100644
index 000000000000..460b6c67ce03
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-168.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-168.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
new file mode 100644
index 000000000000..ed850eb0e822
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-172.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
new file mode 100644
index 000000000000..fb3c940d7bd2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-174.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-174.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
new file mode 100644
index 000000000000..1c4a8ed3e65f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-176.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
new file mode 100644
index 000000000000..f7dcce0b1ebd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-180.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-180.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
new file mode 100644
index 000000000000..1d21b819cd4d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-182.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-182.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
new file mode 100644
index 000000000000..bccc92794ad4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-184.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-184.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
new file mode 100644
index 000000000000..20f5700a9d36
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-188.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
new file mode 100644
index 000000000000..d5a982f98ea2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-190.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-190.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
new file mode 100644
index 000000000000..fdd10980af37
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-192.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
new file mode 100644
index 000000000000..1c7a03f75a11
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-196.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-196.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
new file mode 100644
index 000000000000..d556f5a3a898
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-198.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-198.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
new file mode 100644
index 000000000000..2dd8359f79d2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-200.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-200.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
new file mode 100644
index 000000000000..028176c51f78
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-204.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
new file mode 100644
index 000000000000..48d70d8b68d4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-206.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-206.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
new file mode 100644
index 000000000000..b629b7b1676b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-208.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
new file mode 100644
index 000000000000..2f0d2d8e5477
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-212.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-212.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
new file mode 100644
index 000000000000..1f9b89b66af8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-214.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-214.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
new file mode 100644
index 000000000000..626fe1d045fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-216.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-216.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
new file mode 100644
index 000000000000..359b15ad72a4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-220.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
new file mode 100644
index 000000000000..68db2741b0f9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-222.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-222.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
new file mode 100644
index 000000000000..9036edc12a8e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-224.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
new file mode 100644
index 000000000000..5809421c490f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/abs-pos-non-replaced-vrl-228.xht.ini
@@ -0,0 +1,4 @@
+[abs-pos-non-replaced-vrl-228.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
new file mode 100644
index 000000000000..4620a725e59e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-004.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
new file mode 100644
index 000000000000..c33e7343f164
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-htb-001.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-htb-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
new file mode 100644
index 000000000000..263eb784ce10
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-043.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-043.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
new file mode 100644
index 000000000000..5b54631875be
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-047.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-047.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
new file mode 100644
index 000000000000..326e4a9fb40a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-048.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-048.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
new file mode 100644
index 000000000000..4e780abb699c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-050.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-050.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
new file mode 100644
index 000000000000..f9b72b143e29
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-054.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-054.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
new file mode 100644
index 000000000000..d762e6032bfa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-055.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-055.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
new file mode 100644
index 000000000000..9e43ced0a3f2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-056.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-056.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
new file mode 100644
index 000000000000..cafd04526ee6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-060.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-060.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
new file mode 100644
index 000000000000..1aa841f2d988
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-062.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-062.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
new file mode 100644
index 000000000000..bfd754880d50
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-slr-063.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-slr-063.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
new file mode 100644
index 000000000000..937297c10fd2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-042.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-042.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
new file mode 100644
index 000000000000..dde24a8ed6f2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-045.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-045.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
new file mode 100644
index 000000000000..1a896b155f77
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-046.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-046.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
new file mode 100644
index 000000000000..370828e579ad
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-049.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-049.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
new file mode 100644
index 000000000000..88674ac79dc2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-051.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-051.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
new file mode 100644
index 000000000000..ca3d68207982
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-052.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-052.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
new file mode 100644
index 000000000000..493cb28a35a8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-053.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-053.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
new file mode 100644
index 000000000000..a26f763805f6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-059.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-059.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
new file mode 100644
index 000000000000..47a993d00ef4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-061.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-061.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
new file mode 100644
index 000000000000..710c42feaa7c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-srl-064.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-srl-064.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
new file mode 100644
index 000000000000..08b885b46e18
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
new file mode 100644
index 000000000000..a3734e3b5b79
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-007.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
new file mode 100644
index 000000000000..58e62cdd128c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-008.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
new file mode 100644
index 000000000000..fcf0e4eca740
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-010.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-010.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
new file mode 100644
index 000000000000..d1f29014d96e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-014.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
new file mode 100644
index 000000000000..cdcfbb2364f4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-015.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
new file mode 100644
index 000000000000..cb7e259a9ecb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-016.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
new file mode 100644
index 000000000000..500f528c6ab4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-020.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
new file mode 100644
index 000000000000..ce6fcfe8894d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-022.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-022.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
new file mode 100644
index 000000000000..d445f998823c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vlr-023.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vlr-023.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
new file mode 100644
index 000000000000..328aacd19fdd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
new file mode 100644
index 000000000000..22c6a1aa9e1d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-005.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
new file mode 100644
index 000000000000..09997273c60a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-006.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
new file mode 100644
index 000000000000..e873ceb006f1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-009.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
new file mode 100644
index 000000000000..157c852b8a0e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-011.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
new file mode 100644
index 000000000000..b55a70dfcb26
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-012.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
new file mode 100644
index 000000000000..f3c60fdf2fc3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-013.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
new file mode 100644
index 000000000000..4b2540e8af0a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-019.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
new file mode 100644
index 000000000000..683a2b5cc235
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-021.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-021.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
new file mode 100644
index 000000000000..0be540a7870d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/block-flow-direction-vrl-024.xht.ini
@@ -0,0 +1,4 @@
+[block-flow-direction-vrl-024.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
new file mode 100644
index 000000000000..5ec111287f13
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-002.xht.ini
@@ -0,0 +1,4 @@
+[central-baseline-alignment-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
new file mode 100644
index 000000000000..34a78e97b51b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/central-baseline-alignment-003.xht.ini
@@ -0,0 +1,4 @@
+[central-baseline-alignment-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
new file mode 100644
index 000000000000..14deacf7c2c2
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vlr-013.xht.ini
@@ -0,0 +1,4 @@
+[float-contiguous-vlr-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
new file mode 100644
index 000000000000..7f77b36e2f19
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/float-contiguous-vrl-012.xht.ini
@@ -0,0 +1,4 @@
+[float-contiguous-vrl-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
deleted file mode 100644
index ed213633f7fc..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vlr-003.xht.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[height-width-inline-non-replaced-vlr-003.xht]
-  expected:
-    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 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 not webrender and e10s and (os == "win") and (version == "6.1.7601") 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 == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
-    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
deleted file mode 100644
index 3fd0a69b694f..000000000000
--- a/testing/web-platform/meta/css/css-writing-modes/height-width-inline-non-replaced-vrl-002.xht.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[height-width-inline-non-replaced-vrl-002.xht]
-  expected:
-    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 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 not webrender and e10s and (os == "win") and (version == "6.1.7601") 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 == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): PASS
-    if not debug and not webrender and e10s and (os == "win") and (version == "10.0.15063") 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
-    FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
new file mode 100644
index 000000000000..0b017dbed3f0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[inline-block-alignment-orthogonal-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
new file mode 100644
index 000000000000..e719ae4a0bad
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vlr-005.xht.ini
@@ -0,0 +1,4 @@
+[inline-block-alignment-orthogonal-vlr-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
new file mode 100644
index 000000000000..b0fdff5ec22e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[inline-block-alignment-orthogonal-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
new file mode 100644
index 000000000000..cef837fe6412
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/inline-block-alignment-orthogonal-vrl-004.xht.ini
@@ -0,0 +1,4 @@
+[inline-block-alignment-orthogonal-vrl-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
new file mode 100644
index 000000000000..415d1b85abc5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-htb-001.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-htb-001.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
new file mode 100644
index 000000000000..849879114dfa
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-043.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-043.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
new file mode 100644
index 000000000000..d33df5dc9b5d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-047.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-047.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
new file mode 100644
index 000000000000..8dd4d1573f0f
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-048.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-048.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
new file mode 100644
index 000000000000..8489d85267bb
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-050.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-050.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
new file mode 100644
index 000000000000..4da66444857d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-053.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-053.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
new file mode 100644
index 000000000000..01100b232c68
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-054.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-054.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
new file mode 100644
index 000000000000..97d63035851c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-058.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-058.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
new file mode 100644
index 000000000000..0cfff4d02359
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-slr-060.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-slr-060.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
new file mode 100644
index 000000000000..a8570bfd034e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-042.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-042.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
new file mode 100644
index 000000000000..5dd7f51744a0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-045.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-045.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
new file mode 100644
index 000000000000..28066e79d665
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-046.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-046.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
new file mode 100644
index 000000000000..a0f33007eef7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-049.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-049.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
new file mode 100644
index 000000000000..4466ffc3bd75
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-051.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-051.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
new file mode 100644
index 000000000000..02dc64e150fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-052.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-052.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
new file mode 100644
index 000000000000..640ed3a5a0ff
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-057.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-057.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
new file mode 100644
index 000000000000..835cafa57697
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-srl-059.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-srl-059.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
new file mode 100644
index 000000000000..ccfa202bed12
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
new file mode 100644
index 000000000000..b625ec291ee3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-007.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
new file mode 100644
index 000000000000..b0db01710cda
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-008.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
new file mode 100644
index 000000000000..3c7884f3b832
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-010.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-010.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
new file mode 100644
index 000000000000..0bf20afe4ed0
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-013.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-013.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
new file mode 100644
index 000000000000..6a4dd6006525
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-014.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
new file mode 100644
index 000000000000..ac95aaf6f1c5
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-018.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-018.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
new file mode 100644
index 000000000000..d0b58095c243
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vlr-020.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vlr-020.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
new file mode 100644
index 000000000000..a09ea5c8e17d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
new file mode 100644
index 000000000000..87d38b8fa77a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-005.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
new file mode 100644
index 000000000000..1cb6cbd174bf
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-006.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
new file mode 100644
index 000000000000..2d6d05c5cf7b
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-009.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
new file mode 100644
index 000000000000..7a29a1841f82
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-011.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-011.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
new file mode 100644
index 000000000000..8bd6a2f3b2f1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-012.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-012.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
new file mode 100644
index 000000000000..51f77180e129
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-017.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
new file mode 100644
index 000000000000..08261b110e08
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/line-box-direction-vrl-019.xht.ini
@@ -0,0 +1,4 @@
+[line-box-direction-vrl-019.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
new file mode 100644
index 000000000000..fd2e720be1a6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-023.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-slr-023.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
new file mode 100644
index 000000000000..160313088a87
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-slr-029.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-slr-029.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
new file mode 100644
index 000000000000..df13f0d12541
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-022.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-srl-022.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
new file mode 100644
index 000000000000..ac02a359ff33
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-srl-028.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-srl-028.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
new file mode 100644
index 000000000000..4b78544ac866
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
new file mode 100644
index 000000000000..0eb5fb038303
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-005.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vlr-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
new file mode 100644
index 000000000000..ab50a800275a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-007.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vlr-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
new file mode 100644
index 000000000000..91447fd63f58
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vlr-009.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vlr-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
new file mode 100644
index 000000000000..2ec5112059a9
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
new file mode 100644
index 000000000000..88d69b56cbe4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-004.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vrl-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
new file mode 100644
index 000000000000..8309493ff2f4
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-006.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vrl-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
new file mode 100644
index 000000000000..a08645d29ffd
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/row-progression-vrl-008.xht.ini
@@ -0,0 +1,4 @@
+[row-progression-vrl-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
new file mode 100644
index 000000000000..6c40708ecb49
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-002.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
new file mode 100644
index 000000000000..250820c844ff
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-003.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
new file mode 100644
index 000000000000..f12b1205896c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-004.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
new file mode 100644
index 000000000000..26fad8e1f382
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-005.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
new file mode 100644
index 000000000000..32da10f9e127
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-slr-007.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-slr-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
new file mode 100644
index 000000000000..1f4c6853c37d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/table-column-order-srl-006.xht.ini
@@ -0,0 +1,4 @@
+[table-column-order-srl-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
new file mode 100644
index 000000000000..cd28e4320ee6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vlr-005.xht.ini
@@ -0,0 +1,4 @@
+[text-baseline-vlr-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
new file mode 100644
index 000000000000..82daea13ba67
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-baseline-vrl-004.xht.ini
@@ -0,0 +1,4 @@
+[text-baseline-vrl-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini b/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
new file mode 100644
index 000000000000..6c766ff2c2d7
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-combine-upright-layout-rules-001.html.ini
@@ -0,0 +1,4 @@
+[text-combine-upright-layout-rules-001.html]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
new file mode 100644
index 000000000000..f830e4eb851c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-003.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-003.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
new file mode 100644
index 000000000000..4a0cea76cb21
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-005.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-005.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
new file mode 100644
index 000000000000..d18e5bf7704d
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-007.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-007.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
new file mode 100644
index 000000000000..1d481d9e3c41
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-009.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-009.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
new file mode 100644
index 000000000000..a7eb31ea3705
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-015.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-015.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
new file mode 100644
index 000000000000..a8be8ec67864
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vlr-017.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vlr-017.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
new file mode 100644
index 000000000000..1bdb648be919
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-002.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-002.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
new file mode 100644
index 000000000000..35088d3d2582
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-004.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-004.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
new file mode 100644
index 000000000000..8a8efb5cb528
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-006.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-006.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
new file mode 100644
index 000000000000..7db63ff98704
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-008.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-008.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
new file mode 100644
index 000000000000..ea53923bf3f1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-014.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-014.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini
new file mode 100644
index 000000000000..989656da234a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-writing-modes/text-indent-vrl-016.xht.ini
@@ -0,0 +1,4 @@
+[text-indent-vrl-016.xht]
+  expected:
+    if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
+    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): FAIL
diff --git a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
index bf30b57a1b54..08bee8e967e5 100644
--- a/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
+++ b/testing/web-platform/meta/css/vendor-imports/mozilla/mozilla-central-reftests/images3/object-position-svg-002e.html.ini
@@ -1,4 +1,2 @@
 [object-position-svg-002e.html]
-  expected:
-    if not debug and webrender and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): PASS
-    FAIL
+  expected: FAIL

From dd3666f9d4525b8dc9d41bbbff5bce42e18d6722 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Thu, 8 Nov 2018 22:54:10 +0200
Subject: [PATCH 23/77] Backed out changeset 09ceaf8491d8 (bug 1505328) for
 browser_ext_management.js failures. CLOSED TREE

---
 browser/themes/shared/browser.inc.css         |  4 +++
 .../browser_ext_themes_alpha_accentcolor.js   |  9 +++++--
 .../browser_ext_themes_chromeparity.js        | 21 ++++++++++-----
 .../browser_ext_themes_dynamic_updates.js     | 12 +++++++--
 .../browser/browser_ext_themes_lwtsupport.js  |  6 +++--
 .../browser_ext_themes_sanitization.js        | 26 ++++++++++++++++---
 .../browser_ext_themes_theme_transition.js    | 15 ++++++++++-
 7 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index 12f4d01b3d82..f4e954e644a0 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -19,6 +19,10 @@
   --space-above-tabbar: 8px;
 }
 
+:root[sessionrestored]:-moz-lwtheme {
+  transition: @themeTransition@;
+}
+
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
index 8a48e44cbf14..2fe5bd95a8fd 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
@@ -18,10 +18,15 @@ add_task(async function test_alpha_accentcolor() {
     },
   });
 
-  await extension.startup();
-
   // Add the event listener before loading the extension
   let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
+
+  await extension.startup();
+
+  // wait for theme transition to end
+  await transitionPromise;
+
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(230, 128, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
index 3afef7b4bd7c..1866ccb34afe 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
@@ -20,9 +20,11 @@ add_task(async function test_support_theme_frame() {
     },
   });
 
-  await extension.startup();
-
   let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
   Assert.equal(docEl.getAttribute("lwthemetextcolor"), "bright",
                "LWT text color attribute should be set");
@@ -62,16 +64,21 @@ add_task(async function test_support_theme_frame_inactive() {
     },
   });
 
-  await extension.startup();
-
   let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
                "Window background is set to the colors.frame property");
 
   // Now we'll open a new window to see if the inactive browser accent color changed
+  transitionPromise = waitForTransition(docEl, "background-color");
   let window2 = await BrowserTestUtils.openNewBrowserWindow();
+  await transitionPromise;
+
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR_INACTIVE.join(", ") + ")",
                `Inactive window background color should be ${FRAME_COLOR_INACTIVE}`);
 
@@ -101,9 +108,11 @@ add_task(async function test_lack_of_theme_frame_inactive() {
     },
   });
 
-  await extension.startup();
-
   let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
index d0038f950ab1..70b512cf4f8c 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
@@ -63,6 +63,8 @@ add_task(async function test_dynamic_theme_updates() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
+  let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image1.png",
@@ -74,9 +76,11 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
+  await transitionPromise;
 
   validateTheme("image1.png", ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
+  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image2.png",
@@ -88,6 +92,7 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
+  await transitionPromise;
 
   validateTheme("image2.png", ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -100,7 +105,6 @@ add_task(async function test_dynamic_theme_updates() {
 
   await extension.unload();
 
-  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
 
@@ -127,6 +131,8 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
+  let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_1,
@@ -138,9 +144,11 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
+  await transitionPromise;
 
   validateTheme(BACKGROUND_1, ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
+  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_2,
@@ -152,6 +160,7 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
+  await transitionPromise;
 
   validateTheme(BACKGROUND_2, ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -164,6 +173,5 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
 
   await extension.unload();
 
-  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
index 5776cf3b30e9..60d579ddd020 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
@@ -18,9 +18,11 @@ add_task(async function test_support_LWT_properties() {
     },
   });
 
-  await extension.startup();
-
   let docEl = window.document.documentElement;
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   let style = window.getComputedStyle(docEl);
 
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
index b664c06ba65e..b59eddc8fd63 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
@@ -16,7 +16,11 @@ add_task(async function test_sanitization_invalid() {
     },
   });
 
+  let docEl = document.documentElement;
+
+  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
+  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -42,7 +46,11 @@ add_task(async function test_sanitization_css_variables() {
     },
   });
 
+  let docEl = document.documentElement;
+
+  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
+  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -68,7 +76,11 @@ add_task(async function test_sanitization_transparent() {
     },
   });
 
+  let docEl = document.documentElement;
+
+  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
+  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.ok(
@@ -92,9 +104,12 @@ add_task(async function test_sanitization_transparent_accentcolor() {
     },
   });
 
-  await extension.startup();
-
   let docEl = document.documentElement;
+
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   Assert.equal(
     window.getComputedStyle(docEl).backgroundColor,
     "rgb(255, 255, 255)",
@@ -117,9 +132,12 @@ add_task(async function test_sanitization_transparent_textcolor() {
     },
   });
 
-  await extension.startup();
-
   let docEl = document.documentElement;
+
+  let transitionPromise = waitForTransition(docEl, "background-color");
+  await extension.startup();
+  await transitionPromise;
+
   Assert.equal(
     window.getComputedStyle(docEl).color,
     "rgb(0, 0, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
index 92f1df6ab4ab..804fa1e65006 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
@@ -4,6 +4,7 @@
 // correctly.
 
 add_task(async function test_theme_transition_effects() {
+  const ACCENT_COLOR = "#aaf442";
   const TOOLBAR = "#f27489";
   const TEXT_COLOR = "#000000";
   const TRANSITION_PROPERTY = "background-color";
@@ -12,6 +13,7 @@ add_task(async function test_theme_transition_effects() {
     manifest: {
       "theme": {
         "colors": {
+          "accentcolor": ACCENT_COLOR,
           "textcolor": TEXT_COLOR,
           "toolbar": TOOLBAR,
           "toolbar_text": TEXT_COLOR,
@@ -22,7 +24,18 @@ add_task(async function test_theme_transition_effects() {
 
   await extension.startup();
 
-  // check transition effect for toolbars
+  // check if transition effect is set for root, which affects transition for
+  // accent color
+  let docEl = window.document.documentElement;
+  let rootCS = window.getComputedStyle(docEl);
+
+  Assert.equal(
+    rootCS.getPropertyValue("transition-property"),
+    TRANSITION_PROPERTY,
+    "Transition property set for root"
+  );
+
+  // now check transition effect for toolbars
   let navbar = document.querySelector("#nav-bar");
   let navbarCS = window.getComputedStyle(navbar);
 

From 615e53a7d3272ae64e55ad797ef16affb2f99d4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A3o=20Gottwald?= <dao@mozilla.com>
Date: Thu, 8 Nov 2018 18:41:04 +0000
Subject: [PATCH 24/77] Bug 1499706 - Remove external calls to
 TabsInTitlebar.update and make it private. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D11311

--HG--
extra : moz-landing-system : lando
---
 .../browser-fullScreenAndPointerLock.js        |  5 -----
 browser/base/content/browser-tabsintitlebar.js | 18 +++++++++---------
 browser/base/content/browser.js                |  2 --
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/browser/base/content/browser-fullScreenAndPointerLock.js b/browser/base/content/browser-fullScreenAndPointerLock.js
index ee31ab027cf9..77c011ace3ef 100644
--- a/browser/base/content/browser-fullScreenAndPointerLock.js
+++ b/browser/base/content/browser-fullScreenAndPointerLock.js
@@ -338,11 +338,6 @@ var FullScreen = {
       // This is needed if they use the context menu to quit fullscreen
       this._isPopupOpen = false;
       this.cleanup();
-      // TabsInTitlebar skips appearance updates on resize events for exiting
-      // fullscreen, since that happens before we change the UI here in the
-      // "fullscreen" event. Hence we need to call it here to ensure the
-      // appearance is properly updated. See bug 1173768.
-      TabsInTitlebar.update();
     }
 
     if (enterFS && !document.fullscreenElement) {
diff --git a/browser/base/content/browser-tabsintitlebar.js b/browser/base/content/browser-tabsintitlebar.js
index 55fe3be851c9..6471a77ac19e 100644
--- a/browser/base/content/browser-tabsintitlebar.js
+++ b/browser/base/content/browser-tabsintitlebar.js
@@ -10,18 +10,18 @@ var TabsInTitlebar = {
 
     gDragSpaceObserver.init();
     this._initialized = true;
-    this.update();
+    this._update();
   },
 
   allowedBy(condition, allow) {
     if (allow) {
       if (condition in this._disallowed) {
         delete this._disallowed[condition];
-        this.update();
+        this._update();
       }
     } else if (!(condition in this._disallowed)) {
       this._disallowed[condition] = null;
-      this.update();
+      this._update();
     }
   },
 
@@ -58,12 +58,13 @@ var TabsInTitlebar = {
                    Services.prefs.getBoolPref(this._prefName));
   },
 
-  update() {
-    if (!this._initialized || window.fullScreen) {
+  _update() {
+    if (!this._initialized) {
       return;
     }
 
     let allowed = this.systemSupported &&
+                  !window.fullScreen &&
                   (Object.keys(this._disallowed)).length == 0;
     if (allowed) {
       document.documentElement.setAttribute("tabsintitlebar", "true");
@@ -103,7 +104,7 @@ var gDragSpaceObserver = {
   pref: "browser.tabs.extraDragSpace",
 
   init() {
-    this.update();
+    this._update();
     Services.prefs.addObserver(this.pref, this);
   },
 
@@ -116,15 +117,14 @@ var gDragSpaceObserver = {
       return;
     }
 
-    this.update();
+    this._update();
   },
 
-  update() {
+  _update() {
     if (Services.prefs.getBoolPref(this.pref)) {
       document.documentElement.setAttribute("extradragspace", "true");
     } else {
       document.documentElement.removeAttribute("extradragspace");
     }
-    TabsInTitlebar.update();
   },
 };
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 3e7df37420b5..21e3dcd68156 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -7389,14 +7389,12 @@ const gAccessibilityServiceIndicator = {
       [...document.querySelectorAll(".accessibility-indicator")].forEach(
         indicator => ["click", "keypress"].forEach(type =>
           indicator.addEventListener(type, this)));
-      TabsInTitlebar.update();
     } else if (this._active) {
       this._active = false;
       document.documentElement.removeAttribute("accessibilitymode");
       [...document.querySelectorAll(".accessibility-indicator")].forEach(
         indicator => ["click", "keypress"].forEach(type =>
           indicator.removeEventListener(type, this)));
-      TabsInTitlebar.update();
     }
   },
 

From 886605cb0973587a0c4ca8271cbeab15b4a13ada Mon Sep 17 00:00:00 2001
From: Michael Kohler <me@michaelkohler.info>
Date: Thu, 8 Nov 2018 19:33:00 +0000
Subject: [PATCH 25/77] Bug 1505872 - Remove unneeded dataset() doc r=janerik

Differential Revision: https://phabricator.services.mozilla.com/D11361

--HG--
extra : moz-landing-system : lando
---
 toolkit/components/telemetry/core/nsITelemetry.idl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/toolkit/components/telemetry/core/nsITelemetry.idl b/toolkit/components/telemetry/core/nsITelemetry.idl
index 3eb305c88190..118e19b985d6 100644
--- a/toolkit/components/telemetry/core/nsITelemetry.idl
+++ b/toolkit/components/telemetry/core/nsITelemetry.idl
@@ -141,7 +141,7 @@ interface nsITelemetry : nsISupports
   readonly attribute uint32_t lastShutdownDuration;
 
   /**
-   * The number of failed profile lock attempts that have occurred prior to 
+   * The number of failed profile lock attempts that have occurred prior to
    * successfully locking the profile
    */
   readonly attribute uint32_t failedProfileLockCount;
@@ -284,8 +284,6 @@ interface nsITelemetry : nsISupports
    *   add(int) - Adds an int value to the appropriate bucket
    *   snapshot() - Returns a snapshot of the histogram with the same data fields as in histogramSnapshots()
    *   clear() - Zeros out the histogram's buckets and sum. This is intended to be only used in tests.
-   *   dataset() - identifies what dataset this is in: DATASET_RELEASE_CHANNEL_OPTOUT or ...OPTIN.
-   *               This is intended to be only used in tests.
    */
   [implicit_jscontext]
   jsval getHistogramById(in ACString id);
@@ -311,8 +309,6 @@ interface nsITelemetry : nsISupports
    *   keys() - Returns an array with the string keys of the currently registered histograms
    *   clear() - Clears the registered histograms from this.
    *             This is intended to be only used in tests.
-   *   dataset() - identifies what dataset this is in: DATASET_RELEASE_CHANNEL_OPTOUT or ...OPTIN.
-   *               This is intended to be only used in tests.
    */
   [implicit_jscontext]
   jsval getKeyedHistogramById(in ACString id);

From c803ccff2549ee69ca7d81cd469e28a0a6bb1823 Mon Sep 17 00:00:00 2001
From: Micah Tigley <mtigley@mozilla.com>
Date: Thu, 8 Nov 2018 19:47:29 +0000
Subject: [PATCH 26/77] Bug 1497179 - Avoid overlapping labels in the flex item
 outline. r=pbro

Differential Revision: https://phabricator.services.mozilla.com/D9431

--HG--
extra : moz-landing-system : lando
---
 .../components/FlexItemSizingOutline.js       | 17 +++++++--
 .../client/inspector/flexbox/test/browser.ini |  1 +
 .../browser_flexbox_item_outline_exists.js    |  6 ---
 ...ine_renders_basisfinal_points_correctly.js | 37 +++++++++++++++++++
 devtools/client/themes/layout.css             | 14 ++++---
 5 files changed, 60 insertions(+), 15 deletions(-)
 create mode 100644 devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js

diff --git a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
index 263fa3be62fe..92aa09930e88 100644
--- a/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
+++ b/devtools/client/inspector/flexbox/components/FlexItemSizingOutline.js
@@ -54,8 +54,8 @@ class FlexItemSizingOutline extends PureComponent {
     );
   }
 
-  renderPoint(name) {
-    return dom.div({ className: `flex-outline-point ${name}`, "data-label": name });
+  renderPoint(className, label = className) {
+    return dom.div({ className: `flex-outline-point ${className}`, "data-label": label });
   }
 
   render() {
@@ -138,6 +138,16 @@ class FlexItemSizingOutline extends PureComponent {
     }
     gridTemplateColumns += "]";
 
+    // Check the final and basis points to see if they are the same and if so, combine
+    // them into a single rendered point.
+    const renderedBaseAndFinalPoints = [];
+    if (mainFinalSize === mainBaseSize) {
+      renderedBaseAndFinalPoints.push(this.renderPoint("basisfinal", "basis/final"));
+    } else {
+      renderedBaseAndFinalPoints.push(this.renderPoint("basis"));
+      renderedBaseAndFinalPoints.push(this.renderPoint("final"));
+    }
+
     return (
       dom.div({ className: "flex-outline-container" },
         dom.div(
@@ -150,8 +160,7 @@ class FlexItemSizingOutline extends PureComponent {
               gridTemplateColumns,
             },
           },
-          this.renderPoint("basis"),
-          this.renderPoint("final"),
+          renderedBaseAndFinalPoints,
           showMin ? this.renderPoint("min") : null,
           showMax ? this.renderPoint("max") : null,
           this.renderBasisOutline(mainBaseSize),
diff --git a/devtools/client/inspector/flexbox/test/browser.ini b/devtools/client/inspector/flexbox/test/browser.ini
index ebed5849b10a..f385986816ab 100644
--- a/devtools/client/inspector/flexbox/test/browser.ini
+++ b/devtools/client/inspector/flexbox/test/browser.ini
@@ -22,6 +22,7 @@ support-files =
 [browser_flexbox_item_outline_exists.js]
 [browser_flexbox_item_outline_has_correct_layout.js]
 [browser_flexbox_item_outline_hidden_when_useless.js]
+[browser_flexbox_item_outline_renders_basisfinal_points_correctly.js]
 [browser_flexbox_item_outline_rotates_for_column.js]
 [browser_flexbox_pseudo_elements_are_listed.js]
 [browser_flexbox_sizing_flexibility_not_displayed_when_useless.js]
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
index 54e5d5f56032..34b79d38ca3b 100644
--- a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
+++ b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_exists.js
@@ -25,10 +25,4 @@ add_task(async function() {
 
   ok(basis, "The basis outline exists");
   ok(final, "The final outline exists");
-
-  const [basisPoint, finalPoint] = [...flexOutlineContainer.querySelectorAll(
-    ".flex-outline-point.basis, .flex-outline-point.final")];
-
-  ok(basisPoint, "The basis point exists");
-  ok(finalPoint, "The final point exists");
 });
diff --git a/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
new file mode 100644
index 000000000000..2d334160e7b6
--- /dev/null
+++ b/devtools/client/inspector/flexbox/test/browser_flexbox_item_outline_renders_basisfinal_points_correctly.js
@@ -0,0 +1,37 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test that the flex item outline renders the basis and final points as a single point
+// if their sizes are equal. If not, then render as separate points.
+
+const TEST_URI = URL_ROOT + "doc_flexbox_specific_cases.html";
+
+add_task(async function() {
+  await addTab(TEST_URI);
+  const { inspector, flexboxInspector } = await openLayoutView();
+  const { document: doc } = flexboxInspector;
+
+  info("Select a flex item whose basis size matches its final size.");
+  let onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
+  await selectNode(".item", inspector);
+  let [flexOutlineContainer] = await onFlexItemOutlineRendered;
+
+  const [basisFinalPoint] = [...flexOutlineContainer.querySelectorAll(
+    ".flex-outline-point.basisfinal")];
+
+  ok(basisFinalPoint, "The basis/final point exists");
+
+  info("Select a flex item whose basis size is different than its final size.");
+  onFlexItemOutlineRendered = waitForDOM(doc, ".flex-outline-container");
+  await selectNode(".shrinking .item", inspector);
+  [flexOutlineContainer] = await onFlexItemOutlineRendered;
+
+  const [basis, final] = [...flexOutlineContainer.querySelectorAll(
+    ".flex-outline-point.basis, .flex-outline-point.final")];
+
+  ok(basis, "The basis point exists");
+  ok(final, "The final point exists");
+});
diff --git a/devtools/client/themes/layout.css b/devtools/client/themes/layout.css
index a22593333ea7..519bda0f5016 100644
--- a/devtools/client/themes/layout.css
+++ b/devtools/client/themes/layout.css
@@ -304,7 +304,8 @@
   grid-row: 1;
 }
 
-.flex-outline-point.basis {
+.flex-outline-point.basis,
+.flex-outline-point.basisfinal {
   grid-column-end: basis-end;
   justify-self: end;
 }
@@ -357,7 +358,8 @@
 }
 
 .flex-outline-point.basis::before,
-.flex-outline-point.final::before {
+.flex-outline-point.final::before,
+.flex-outline-point.basisfinal::before {
   top: -12px;
 }
 
@@ -366,7 +368,7 @@
   bottom: -12px;
 }
 
-.flex-outline.column .flex-outline-point.min::before,
+.flex-outline.column .flex-outline-point.max::before,
 .flex-outline.column .flex-outline-point.min::before {
   text-indent: -12px;
 }
@@ -374,13 +376,15 @@
 .flex-outline-point.final::before,
 .flex-outline.shrinking .flex-outline-point.min::before,
 .flex-outline-point.max::before,
-.flex-outline.shrinking .flex-outline-point.basis::before {
+.flex-outline.shrinking .flex-outline-point.basis::before,
+.flex-outline.column .flex-outline-point.basisfinal::before {
   border-width: 0 0 0 1px;
 }
 
 .flex-outline-point.basis::before,
 .flex-outline-point.min::before,
-.flex-outline.shrinking .flex-outline-point.final::before {
+.flex-outline.shrinking .flex-outline-point.final::before,
+.flex-outline.row .flex-outline-point.basisfinal::before {
   border-width: 0 1px 0 0;
 }
 

From ba222f72b8d074f00d63d72897b293d3409f9db3 Mon Sep 17 00:00:00 2001
From: Jeff Gilbert <jgilbert@mozilla.com>
Date: Thu, 8 Nov 2018 17:19:02 +0000
Subject: [PATCH 27/77] Bug 1492580 - Limit glGetError flush loop and handle
 CONTEXT_LOST. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D11270

--HG--
extra : moz-landing-system : lando
---
 gfx/gl/GLContext.cpp | 24 ++++++++++++++++++++++++
 gfx/gl/GLContext.h   | 13 +------------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/gfx/gl/GLContext.cpp b/gfx/gl/GLContext.cpp
index 6363a4b7c60b..5a083fafc6ff 100644
--- a/gfx/gl/GLContext.cpp
+++ b/gfx/gl/GLContext.cpp
@@ -2058,6 +2058,30 @@ GLContext::MarkDestroyed()
     mSymbols = {};
 }
 
+// -
+
+GLenum
+GLContext::RawGetErrorAndClear() const
+{
+    const GLenum ret = mSymbols.fGetError();
+
+    auto flushedErr = ret;
+    uint32_t i = 1;
+    while (flushedErr && flushedErr != LOCAL_GL_CONTEXT_LOST) {
+        if (i == 100) {
+            gfxCriticalError() << "Flushing glGetError still " << gfx::hexa(flushedErr)
+                               << " after " << i << " calls.";
+            break;
+        }
+        flushedErr = mSymbols.fGetError();
+        i += 1;
+    }
+
+    return ret;
+}
+
+// -
+
 #ifdef MOZ_GL_DEBUG
 /* static */ void
 GLContext::AssertNotPassingStackBufferToTheGL(const void* ptr)
diff --git a/gfx/gl/GLContext.h b/gfx/gl/GLContext.h
index c0f5d2d191c1..ae299422b6fc 100644
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -579,18 +579,7 @@ public:
 private:
     mutable GLenum mTopError = 0;
 
-    GLenum RawGetError() const {
-        return mSymbols.fGetError();
-    }
-
-    GLenum RawGetErrorAndClear() const {
-        GLenum err = RawGetError();
-
-        if (err)
-            while (RawGetError()) {}
-
-        return err;
-    }
+    GLenum RawGetErrorAndClear() const;
 
     GLenum FlushErrors() const {
         GLenum err = RawGetErrorAndClear();

From 8e407376a6cf8dd3fe388664bcee21edf6e4fc1a Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Thu, 8 Nov 2018 18:03:37 +0000
Subject: [PATCH 28/77] Bug 1495749 - Allow add-ons to be updated via policy by
 uninstalling and reinstalling them. r=mkaply

Differential Revision: https://phabricator.services.mozilla.com/D11238

--HG--
rename : browser/components/enterprisepolicies/tests/browser/policytest.xpi => browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi
extra : moz-landing-system : lando
---
 .../enterprisepolicies/Policies.jsm           |  48 +++++++++++-------
 .../tests/browser/browser.ini                 |   3 +-
 .../browser/browser_policy_extensions.js      |  37 +++++++++++++-
 .../{policytest.xpi => policytest_v0.1.xpi}   | Bin
 .../tests/browser/policytest_v0.2.xpi         |   0
 5 files changed, 67 insertions(+), 21 deletions(-)
 rename browser/components/enterprisepolicies/tests/browser/{policytest.xpi => policytest_v0.1.xpi} (100%)
 create mode 100644 browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index a6420af294bc..ffb341add9dd 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -489,8 +489,28 @@ var Policies = {
 
   "Extensions": {
     onBeforeUIStartup(manager, param) {
+      let uninstallingPromise = Promise.resolve();
+      if ("Uninstall" in param) {
+        uninstallingPromise = runOncePerModification("extensionsUninstall", JSON.stringify(param.Uninstall), async () => {
+          // If we're uninstalling add-ons, re-run the extensionsInstall runOnce even if it hasn't
+          // changed, which will allow add-ons to be updated.
+          Services.prefs.clearUserPref("browser.policies.runOncePerModification.extensionsInstall");
+          let addons = await AddonManager.getAddonsByIDs(param.Uninstall);
+          for (let addon of addons) {
+            if (addon) {
+              try {
+                await addon.uninstall();
+              } catch (e) {
+                // This can fail for add-ons that can't be uninstalled.
+                // Just ignore.
+              }
+            }
+          }
+        });
+      }
       if ("Install" in param) {
-        runOncePerModification("extensionsInstall", JSON.stringify(param.Install), () => {
+        runOncePerModification("extensionsInstall", JSON.stringify(param.Install), async () => {
+          await uninstallingPromise;
           for (let location of param.Install) {
             let url;
             if (location.includes("://")) {
@@ -542,21 +562,6 @@ var Policies = {
           }
         });
       }
-      if ("Uninstall" in param) {
-        runOncePerModification("extensionsUninstall", JSON.stringify(param.Uninstall), async () => {
-          let addons = await AddonManager.getAddonsByIDs(param.Uninstall);
-          for (let addon of addons) {
-            if (addon) {
-              try {
-                addon.uninstall();
-              } catch (e) {
-                // This can fail for add-ons that can't be uninstalled.
-                // Just ignore.
-              }
-            }
-          }
-        });
-      }
       if ("Locked" in param) {
         for (let ID of param.Locked) {
           manager.disallowFeature(`modify-extension:${ID}`);
@@ -1044,6 +1049,8 @@ function runOnce(actionName, callback) {
  * callback once when the policy is set, then never again.
  * runOncePerModification runs the callback once each time the policy value
  * changes from its previous value.
+ * If the callback that was passed is an async function, you can await on this
+ * function to await for the callback.
  *
  * @param {string} actionName
  *        A given name which will be used to track if this callback has run.
@@ -1055,16 +1062,19 @@ function runOnce(actionName, callback) {
  *        string.
  * @param {Function} callback
  *        The callback to be run when the pref value changes
+ * @returns Promise
+ *        A promise that will resolve once the callback finishes running.
+ *
  */
-function runOncePerModification(actionName, policyValue, callback) {
+async function runOncePerModification(actionName, policyValue, callback) {
   let prefName = `browser.policies.runOncePerModification.${actionName}`;
   let oldPolicyValue = Services.prefs.getStringPref(prefName, undefined);
   if (policyValue === oldPolicyValue) {
     log.debug(`Not running action ${actionName} again because the policy's value is unchanged`);
-    return;
+    return Promise.resolve();
   }
   Services.prefs.setStringPref(prefName, policyValue);
-  callback();
+  return callback();
 }
 
 let gChromeURLSBlocked = false;
diff --git a/browser/components/enterprisepolicies/tests/browser/browser.ini b/browser/components/enterprisepolicies/tests/browser/browser.ini
index 91a4f7c91da1..5bdbd555fe2c 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser.ini
+++ b/browser/components/enterprisepolicies/tests/browser/browser.ini
@@ -5,7 +5,8 @@ support-files =
   config_broken_json.json
   opensearch.html
   opensearchEngine.xml
-  policytest.xpi
+  policytest_v0.1.xpi
+  policytest_v0.2.xpi
   policy_websitefilter_block.html
   policy_websitefilter_exception.html
   ../../../../../toolkit/components/antitracking/test/browser/page.html
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
index 64fb096bb55f..8f351b46b46d 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
@@ -3,6 +3,7 @@
 "use strict";
 
 const addonID = "policytest@mozilla.com";
+const BASE_URL = "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser";
 
 add_task(async function test_addon_install() {
   let installPromise = wait_for_addon_install();
@@ -10,7 +11,7 @@ add_task(async function test_addon_install() {
     "policies": {
       "Extensions": {
         "Install": [
-          "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser/policytest.xpi",
+          `${BASE_URL}/policytest_v0.1.xpi`,
         ],
         "Locked": [
           addonID,
@@ -21,6 +22,7 @@ add_task(async function test_addon_install() {
   await installPromise;
   let addon = await AddonManager.getAddonByID(addonID);
   isnot(addon, null, "Addon not installed.");
+  is(addon.version, "0.1", "Addon version is correct");
 
   Assert.deepEqual(addon.installTelemetryInfo, {source: "enterprise-policy"},
                    "Got the expected addon.installTelemetryInfo");
@@ -41,7 +43,40 @@ add_task(async function test_addon_locked() {
   BrowserTestUtils.removeTab(tab);
 });
 
+add_task(async function test_addon_reinstall() {
+  // Test that uninstalling and reinstalling the same addon ID works as expected.
+  // This can be used to update an addon.
+
+  let uninstallPromise = wait_for_addon_uninstall();
+  let installPromise = wait_for_addon_install();
+  await setupPolicyEngineWithJson({
+    "policies": {
+      "Extensions": {
+        "Uninstall": [
+          addonID,
+        ],
+        "Install": [
+          `${BASE_URL}/policytest_v0.2.xpi`,
+        ],
+      },
+    },
+  });
+
+  // Older version was uninstalled
+  await uninstallPromise;
+
+  // New version was installed
+  await installPromise;
+
+  let addon = await AddonManager.getAddonByID(addonID);
+  isnot(addon, null, "Addon still exists because the policy was used to update it.");
+  is(addon.version, "0.2", "New version is correct");
+});
+
+
 add_task(async function test_addon_uninstall() {
+  EnterprisePolicyTesting.resetRunOnceState();
+
   let uninstallPromise = wait_for_addon_uninstall();
   await setupPolicyEngineWithJson({
     "policies": {
diff --git a/browser/components/enterprisepolicies/tests/browser/policytest.xpi b/browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi
similarity index 100%
rename from browser/components/enterprisepolicies/tests/browser/policytest.xpi
rename to browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi
diff --git a/browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi b/browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi
new file mode 100644
index 000000000000..e69de29bb2d1

From 4f99ddecded7e1a80fb1f164ec9a686ab4e114b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 17:58:58 +0000
Subject: [PATCH 29/77] Bug 1505420 - Remove the first-letter bit from the
 first-line parent's first continuation. r=bzbarsky

Since the first-line could've been pushed to another column.

Differential Revision: https://phabricator.services.mozilla.com/D11352

--HG--
extra : moz-landing-system : lando
---
 layout/base/crashtests/1505420.html    | 19 +++++++++++++++++++
 layout/base/crashtests/crashtests.list |  1 +
 layout/base/nsCSSFrameConstructor.cpp  |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 layout/base/crashtests/1505420.html

diff --git a/layout/base/crashtests/1505420.html b/layout/base/crashtests/1505420.html
new file mode 100644
index 000000000000..c02e8f127f00
--- /dev/null
+++ b/layout/base/crashtests/1505420.html
@@ -0,0 +1,19 @@
+<style>
+  *::first-letter {}
+</style>
+<li id="list">
+</li>
+<script>
+  list.offsetTop;
+  let s = document.createElement('style');
+  s.textContent = `
+    * {
+      columns: 56;
+    }
+    *::first-line { }
+  `;
+  document.documentElement.appendChild(s);
+  list.innerText = 'ó';
+  list.offsetTop;
+  list.textContent = '';
+</script>
diff --git a/layout/base/crashtests/crashtests.list b/layout/base/crashtests/crashtests.list
index 48a27eb785e3..6761ea163df9 100644
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -547,3 +547,4 @@ load 1489149.html
 load 1490037.html
 load 1494332.html
 load 1494030.html
+load 1505420.html
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index b15741fcf81f..1e5bf644ab2e 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -10543,7 +10543,7 @@ nsCSSFrameConstructor::CreateLetterFrame(nsContainerFrame* aBlockFrame,
                "Setting up a first-letter frame on a non-first block continuation?");
     auto parent = static_cast<nsContainerFrame*>(aParentFrame->FirstContinuation());
     if (MOZ_UNLIKELY(parent->IsLineFrame())) {
-      parent = parent->GetParent();
+      parent = static_cast<nsContainerFrame*>(parent->GetParent()->FirstContinuation());
     }
     parent->SetHasFirstLetterChild();
     aBlockFrame->SetProperty(nsContainerFrame::FirstLetterProperty(),
@@ -10664,7 +10664,7 @@ static void ClearHasFirstLetterChildFrom(nsContainerFrame* aParentFrame)
     static_cast<nsContainerFrame*>(aParentFrame->FirstContinuation());
   if (MOZ_UNLIKELY(parent->IsLineFrame())) {
     MOZ_ASSERT(!parent->HasFirstLetterChild());
-    parent = parent->GetParent();
+    parent = static_cast<nsContainerFrame*>(parent->GetParent()->FirstContinuation());
   }
   MOZ_ASSERT(parent->HasFirstLetterChild());
   parent->ClearHasFirstLetterChild();

From 93c86f325a6ee2bf6c777a964351b2a7c306ae38 Mon Sep 17 00:00:00 2001
From: WR Updater Bot <graphics-team@mozilla.staktrace.com>
Date: Thu, 8 Nov 2018 18:56:03 +0000
Subject: [PATCH 30/77] Bug 1505778 - Update webrender to commit
 b8829189cfc1769550c9ab4a4bb994e28621f009 (WR PR #3270). r=kats

Differential Revision: https://phabricator.services.mozilla.com/D11358

--HG--
extra : moz-landing-system : lando
---
 gfx/webrender/src/clip.rs                   |  12 +-
 gfx/webrender/src/clip_scroll_tree.rs       |   2 +-
 gfx/webrender/src/display_list_flattener.rs |  10 +-
 gfx/webrender/src/frame_builder.rs          |   7 -
 gfx/webrender/src/freelist.rs               |  10 +-
 gfx/webrender/src/intern.rs                 |  41 ++-
 gfx/webrender/src/lib.rs                    |   1 +
 gfx/webrender/src/picture.rs                | 211 +++++++------
 gfx/webrender/src/prim_store.rs             |  75 +++--
 gfx/webrender/src/render_backend.rs         |  17 -
 gfx/webrender/src/render_task.rs            |  27 +-
 gfx/webrender/src/scene_builder.rs          |   4 -
 gfx/webrender/src/surface.rs                | 331 ++++++++++++++++++++
 gfx/webrender_bindings/revision.txt         |   2 +-
 14 files changed, 550 insertions(+), 200 deletions(-)
 create mode 100644 gfx/webrender/src/surface.rs

diff --git a/gfx/webrender/src/clip.rs b/gfx/webrender/src/clip.rs
index 7c9a4e654172..a1b23b7a4c03 100644
--- a/gfx/webrender/src/clip.rs
+++ b/gfx/webrender/src/clip.rs
@@ -11,7 +11,7 @@ use app_units::Au;
 use border::{ensure_no_corner_overlap, BorderRadiusAu};
 use box_shadow::{BLUR_SAMPLE_SCALE, BoxShadowClipSource, BoxShadowCacheKey};
 use box_shadow::get_max_scale_for_box_shadow;
-use clip_scroll_tree::{ClipScrollTree, CoordinateSystemId, ROOT_SPATIAL_NODE_INDEX, SpatialNodeIndex};
+use clip_scroll_tree::{ClipScrollTree, ROOT_SPATIAL_NODE_INDEX, SpatialNodeIndex};
 use ellipse::Ellipse;
 use gpu_cache::{GpuCache, GpuCacheHandle, ToGpuBlocks};
 use gpu_types::{BoxShadowStretchMode};
@@ -97,13 +97,14 @@ use util::{extract_inner_rect_safe, project_rect, ScaleOffset};
 // Type definitions for interning clip nodes.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub struct ClipDataMarker;
 
 pub type ClipDataStore = intern::DataStore<ClipItemKey, ClipNode, ClipDataMarker>;
 pub type ClipDataHandle = intern::Handle<ClipDataMarker>;
 pub type ClipDataUpdateList = intern::UpdateList<ClipItemKey>;
 pub type ClipDataInterner = intern::Interner<ClipItemKey, ClipItemSceneData, ClipDataMarker>;
+pub type ClipUid = intern::ItemUid<ClipDataMarker>;
 
 // Result of comparing a clip node instance against a local rect.
 #[derive(Debug)]
@@ -256,7 +257,6 @@ struct ClipNodeInfo {
     conversion: ClipSpaceConversion,
     handle: ClipDataHandle,
     spatial_node_index: SpatialNodeIndex,
-    has_non_root_coord_system: bool,
 }
 
 impl ClipNode {
@@ -423,7 +423,6 @@ pub struct ClipChainInstance {
     // Combined clip rect for clips that are in the
     // same coordinate system as the primitive.
     pub local_clip_rect: LayoutRect,
-    pub has_non_root_coord_system: bool,
     pub has_non_local_clips: bool,
     // If true, this clip chain requires allocation
     // of a clip mask.
@@ -578,7 +577,6 @@ impl ClipStore {
         // Run through the clip nodes, and see which ones affect this prim region.
 
         let first_clip_node_index = self.clip_node_instances.len() as u32;
-        let mut has_non_root_coord_system = false;
         let mut has_non_local_clips = false;
         let mut needs_mask = false;
 
@@ -664,8 +662,6 @@ impl ClipStore {
                         spatial_node_index: node_info.spatial_node_index,
                     };
                     self.clip_node_instances.push(instance);
-
-                    has_non_root_coord_system |= node_info.has_non_root_coord_system;
                 }
             }
         }
@@ -679,7 +675,6 @@ impl ClipStore {
         // Return a valid clip chain instance
         Some(ClipChainInstance {
             clips_range,
-            has_non_root_coord_system,
             has_non_local_clips,
             local_clip_rect,
             pic_clip_rect,
@@ -1322,7 +1317,6 @@ fn add_clip_node_to_current_chain(
             conversion,
             handle,
             spatial_node_index: clip_spatial_node_index,
-            has_non_root_coord_system: clip_spatial_node.coordinate_system_id != CoordinateSystemId::root(),
         })
     }
 
diff --git a/gfx/webrender/src/clip_scroll_tree.rs b/gfx/webrender/src/clip_scroll_tree.rs
index 1f4b9f3b1909..09ff00d75f55 100644
--- a/gfx/webrender/src/clip_scroll_tree.rs
+++ b/gfx/webrender/src/clip_scroll_tree.rs
@@ -41,7 +41,7 @@ impl CoordinateSystem {
     }
 }
 
-#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq, PartialOrd)]
+#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq, PartialOrd, Ord)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub struct SpatialNodeIndex(pub usize);
diff --git a/gfx/webrender/src/display_list_flattener.rs b/gfx/webrender/src/display_list_flattener.rs
index 9398ead0fd92..79a2b4fed08e 100644
--- a/gfx/webrender/src/display_list_flattener.rs
+++ b/gfx/webrender/src/display_list_flattener.rs
@@ -173,7 +173,6 @@ impl<'a> DisplayListFlattener<'a> {
         output_pipelines: &FastHashSet<PipelineId>,
         frame_builder_config: &FrameBuilderConfig,
         new_scene: &mut Scene,
-        scene_id: u64,
         picture_id_generator: &mut PictureIdGenerator,
         resources: &mut DocumentResources,
     ) -> FrameBuilder {
@@ -221,7 +220,6 @@ impl<'a> DisplayListFlattener<'a> {
             view.inner_rect,
             background_color,
             view.window_size,
-            scene_id,
             flattener,
         )
     }
@@ -1007,6 +1005,7 @@ impl<'a> DisplayListFlattener<'a> {
                     &mut self.picture_id_generator,
                     &mut self.prim_store,
                     &self.resources.prim_interner,
+                    &self.clip_store,
                 );
                 (sc.is_3d(), extra_instance)
             },
@@ -1141,6 +1140,7 @@ impl<'a> DisplayListFlattener<'a> {
             prim_list,
             stacking_context.spatial_node_index,
             max_clip,
+            &self.clip_store,
         );
         let leaf_pic_index = self.prim_store.create_picture(leaf_picture);
 
@@ -1185,6 +1185,7 @@ impl<'a> DisplayListFlattener<'a> {
                 prim_list,
                 stacking_context.spatial_node_index,
                 max_clip,
+                &self.clip_store,
             );
 
             current_pic_index = self.prim_store.create_picture(container_picture);
@@ -1211,6 +1212,7 @@ impl<'a> DisplayListFlattener<'a> {
                 prim_list,
                 stacking_context.spatial_node_index,
                 max_clip,
+                &self.clip_store,
             );
             let filter_pic_index = self.prim_store.create_picture(filter_picture);
             current_pic_index = filter_pic_index;
@@ -1244,6 +1246,7 @@ impl<'a> DisplayListFlattener<'a> {
                 prim_list,
                 stacking_context.spatial_node_index,
                 max_clip,
+                &self.clip_store,
             );
             let blend_pic_index = self.prim_store.create_picture(blend_picture);
             current_pic_index = blend_pic_index;
@@ -1585,6 +1588,7 @@ impl<'a> DisplayListFlattener<'a> {
                             prim_list,
                             pending_shadow.clip_and_scroll.spatial_node_index,
                             max_clip,
+                            &self.clip_store,
                         );
 
                         // Create the primitive to draw the shadow picture into the scene.
@@ -2307,6 +2311,7 @@ impl FlattenedStackingContext {
         picture_id_generator: &mut PictureIdGenerator,
         prim_store: &mut PrimitiveStore,
         prim_interner: &PrimitiveDataInterner,
+        clip_store: &ClipStore,
     ) -> Option<PrimitiveInstance> {
         if !self.is_3d() || self.primitives.is_empty() {
             return None
@@ -2335,6 +2340,7 @@ impl FlattenedStackingContext {
             prim_list,
             self.spatial_node_index,
             LayoutRect::max_rect(),
+            clip_store,
         );
 
         let pic_index = prim_store.create_picture(container_picture);
diff --git a/gfx/webrender/src/frame_builder.rs b/gfx/webrender/src/frame_builder.rs
index 7d2887501f57..8f2298b606d5 100644
--- a/gfx/webrender/src/frame_builder.rs
+++ b/gfx/webrender/src/frame_builder.rs
@@ -57,7 +57,6 @@ pub struct FrameBuilder {
     screen_rect: DeviceUintRect,
     background_color: Option<ColorF>,
     window_size: DeviceUintSize,
-    scene_id: u64,
     root_pic_index: PictureIndex,
     pub prim_store: PrimitiveStore,
     pub clip_store: ClipStore,
@@ -66,7 +65,6 @@ pub struct FrameBuilder {
 }
 
 pub struct FrameBuildingContext<'a> {
-    pub scene_id: u64,
     pub device_pixel_scale: DevicePixelScale,
     pub scene_properties: &'a SceneProperties,
     pub pipelines: &'a FastHashMap<PipelineId, Arc<ScenePipeline>>,
@@ -107,7 +105,6 @@ pub struct PictureContext {
 /// Mutable state of a picture that gets modified when
 /// the children are processed.
 pub struct PictureState {
-    pub has_non_root_coord_system: bool,
     pub is_cacheable: bool,
     pub local_rect_changed: bool,
     pub map_local_to_pic: SpaceMapper<LayoutPixel, PicturePixel>,
@@ -146,7 +143,6 @@ impl FrameBuilder {
             screen_rect: DeviceUintRect::zero(),
             window_size: DeviceUintSize::zero(),
             background_color: None,
-            scene_id: 0,
             root_pic_index: PictureIndex(0),
             config: FrameBuilderConfig {
                 default_font_render_mode: FontRenderMode::Mono,
@@ -161,7 +157,6 @@ impl FrameBuilder {
         screen_rect: DeviceUintRect,
         background_color: Option<ColorF>,
         window_size: DeviceUintSize,
-        scene_id: u64,
         flattener: DisplayListFlattener,
     ) -> Self {
         FrameBuilder {
@@ -172,7 +167,6 @@ impl FrameBuilder {
             screen_rect,
             background_color,
             window_size,
-            scene_id,
             config: flattener.config,
         }
     }
@@ -207,7 +201,6 @@ impl FrameBuilder {
         let world_rect = (self.screen_rect.to_f32() / device_pixel_scale).round_out();
 
         let frame_context = FrameBuildingContext {
-            scene_id: self.scene_id,
             device_pixel_scale,
             scene_properties,
             pipelines,
diff --git a/gfx/webrender/src/freelist.rs b/gfx/webrender/src/freelist.rs
index 98ae68ee1033..0081428b4b34 100644
--- a/gfx/webrender/src/freelist.rs
+++ b/gfx/webrender/src/freelist.rs
@@ -20,7 +20,7 @@
 //! TODO(gw): Add an occupied list head, for fast iteration of the occupied list
 //! to implement retain() style functionality.
 
-use std::fmt;
+use std::{fmt, u32};
 use std::marker::PhantomData;
 
 #[derive(Debug, Copy, Clone, PartialEq)]
@@ -68,6 +68,14 @@ impl<M> FreeListHandle<M> {
             _marker: PhantomData,
         }
     }
+
+    pub fn invalid() -> Self {
+        Self {
+            index: 0,
+            epoch: Epoch::invalid(),
+            _marker: PhantomData,
+        }
+    }
 }
 
 impl<M> Clone for WeakFreeListHandle<M> {
diff --git a/gfx/webrender/src/intern.rs b/gfx/webrender/src/intern.rs
index d9b0a5f0f728..2c4162ce568f 100644
--- a/gfx/webrender/src/intern.rs
+++ b/gfx/webrender/src/intern.rs
@@ -63,15 +63,30 @@ pub struct UpdateList<S> {
     updates: Vec<Update<S>>,
 }
 
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Debug, Copy, Clone, Eq, Hash, PartialEq)]
+pub struct ItemUid<T> {
+    uid: usize,
+    _marker: PhantomData<T>,
+}
+
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 #[derive(Debug, Copy, Clone)]
 pub struct Handle<T> {
-    index: usize,
+    index: u32,
     epoch: Epoch,
+    uid: ItemUid<T>,
     _marker: PhantomData<T>,
 }
 
+impl <T> Handle<T> where T: Copy {
+    pub fn uid(&self) -> ItemUid<T> {
+        self.uid
+    }
+}
+
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub enum UpdateKind<S> {
@@ -150,7 +165,7 @@ impl<S, T, M> DataStore<S, T, M> where S: Debug, T: From<S>, M: Debug {
 impl<S, T, M> ops::Index<Handle<M>> for DataStore<S, T, M> {
     type Output = T;
     fn index(&self, handle: Handle<M>) -> &T {
-        let item = &self.items[handle.index];
+        let item = &self.items[handle.index as usize];
         assert_eq!(item.epoch, handle.epoch);
         &item.data
     }
@@ -160,7 +175,7 @@ impl<S, T, M> ops::Index<Handle<M>> for DataStore<S, T, M> {
 /// Retrieve an item from the store via handle
 impl<S, T, M> ops::IndexMut<Handle<M>> for DataStore<S, T, M> {
     fn index_mut(&mut self, handle: Handle<M>) -> &mut T {
-        let item = &mut self.items[handle.index];
+        let item = &mut self.items[handle.index as usize];
         assert_eq!(item.epoch, handle.epoch);
         &mut item.data
     }
@@ -182,6 +197,8 @@ pub struct Interner<S : Eq + Hash + Clone + Debug, D, M> {
     updates: Vec<Update<S>>,
     /// The current epoch for the interner.
     current_epoch: Epoch,
+    /// Incrementing counter for identifying stable values.
+    next_uid: usize,
     /// The information associated with each interned
     /// item that can be accessed by the interner.
     local_data: Vec<Item<D>>,
@@ -195,6 +212,7 @@ impl<S, D, M> Interner<S, D, M> where S: Eq + Hash + Clone + Debug, M: Copy + De
             free_list: Vec::new(),
             updates: Vec::new(),
             current_epoch: Epoch(1),
+            next_uid: 0,
             local_data: Vec::new(),
         }
     }
@@ -221,10 +239,10 @@ impl<S, D, M> Interner<S, D, M> where S: Eq + Hash + Clone + Debug, M: Copy + De
             // via valid handles.
             if handle.epoch != self.current_epoch {
                 self.updates.push(Update {
-                    index: handle.index,
+                    index: handle.index as usize,
                     kind: UpdateKind::UpdateEpoch,
                 });
-                self.local_data[handle.index].epoch = self.current_epoch;
+                self.local_data[handle.index as usize].epoch = self.current_epoch;
             }
             handle.epoch = self.current_epoch;
             return *handle;
@@ -246,14 +264,19 @@ impl<S, D, M> Interner<S, D, M> where S: Eq + Hash + Clone + Debug, M: Copy + De
 
         // Generate a handle for access via the data store.
         let handle = Handle {
-            index,
+            index: index as u32,
             epoch: self.current_epoch,
+            uid: ItemUid {
+                uid: self.next_uid,
+                _marker: PhantomData,
+            },
             _marker: PhantomData,
         };
 
         // Store this handle so the next time it is
         // interned, it gets re-used.
         self.map.insert(data.clone(), handle);
+        self.next_uid += 1;
 
         // Create the local data for this item that is
         // being interned.
@@ -291,9 +314,9 @@ impl<S, D, M> Interner<S, D, M> where S: Eq + Hash + Clone + Debug, M: Copy + De
                 //  - Add index to the free-list for re-use.
                 //  - Add an update to the data store to invalidate this slow.
                 //  - Remove from the hash map.
-                free_list.push(handle.index);
+                free_list.push(handle.index as usize);
                 updates.push(Update {
-                    index: handle.index,
+                    index: handle.index as usize,
                     kind: UpdateKind::Remove,
                 });
                 return false;
@@ -318,7 +341,7 @@ impl<S, D, M> Interner<S, D, M> where S: Eq + Hash + Clone + Debug, M: Copy + De
 impl<S, D, M> ops::Index<Handle<M>> for Interner<S, D, M> where S: Eq + Clone + Hash + Debug, M: Copy + Debug {
     type Output = D;
     fn index(&self, handle: Handle<M>) -> &D {
-        let item = &self.local_data[handle.index];
+        let item = &self.local_data[handle.index as usize];
         assert_eq!(item.epoch, handle.epoch);
         &item.data
     }
diff --git a/gfx/webrender/src/lib.rs b/gfx/webrender/src/lib.rs
index e1fef4faa762..a84cb2917fd7 100644
--- a/gfx/webrender/src/lib.rs
+++ b/gfx/webrender/src/lib.rs
@@ -109,6 +109,7 @@ mod scene_builder;
 mod segment;
 mod shade;
 mod spatial_node;
+mod surface;
 mod texture_allocator;
 mod texture_cache;
 mod tiling;
diff --git a/gfx/webrender/src/picture.rs b/gfx/webrender/src/picture.rs
index 780c0bc6f88b..18738e2735db 100644
--- a/gfx/webrender/src/picture.rs
+++ b/gfx/webrender/src/picture.rs
@@ -3,11 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use api::{DeviceRect, FilterOp, MixBlendMode, PipelineId, PremultipliedColorF, PictureRect, PicturePoint};
-use api::{DeviceIntRect, DeviceIntSize, DevicePoint, LayoutRect, PictureToRasterTransform, LayoutPixel};
-use api::{DevicePixelScale, PictureIntPoint, PictureIntRect, PictureIntSize, RasterRect, RasterSpace};
+use api::{DeviceIntRect, DevicePoint, LayoutRect, PictureToRasterTransform, LayoutPixel};
+use api::{DevicePixelScale, RasterRect, RasterSpace};
 use api::{PicturePixel, RasterPixel, WorldPixel, WorldRect};
 use box_shadow::{BLUR_SAMPLE_SCALE};
-use clip::ClipNodeCollector;
+use clip::{ClipNodeCollector, ClipStore};
 use clip_scroll_tree::{ROOT_SPATIAL_NODE_INDEX, ClipScrollTree, SpatialNodeIndex};
 use euclid::{TypedScale, vec3, TypedRect};
 use internal_types::{FastHashMap, PlaneSplitter};
@@ -21,6 +21,7 @@ use render_task::{ClearMode, RenderTask, RenderTaskCacheEntryHandle};
 use render_task::{RenderTaskCacheKey, RenderTaskCacheKeyKind, RenderTaskId, RenderTaskLocation};
 use scene::{FilterOpHelpers, SceneProperties};
 use smallvec::SmallVec;
+use surface::SurfaceDescriptor;
 use std::{mem, ops};
 use tiling::RenderTargetKind;
 use util::{TransformedRectKind, MatrixHelpers, MaxRect};
@@ -194,59 +195,6 @@ impl PictureIdGenerator {
     }
 }
 
-// Cache key that determines whether a pre-existing
-// picture in the texture cache matches the content
-// of the current picture.
-#[derive(Clone, Debug, Hash, PartialEq, Eq)]
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct PictureCacheKey {
-    // NOTE: We specifically want to ensure that we
-    //       don't include the device space origin
-    //       of this picture in the cache key, because
-    //       we want the cache to remain valid as it
-    //       is scrolled and/or translated by animation.
-    //       This is valid while we have the restriction
-    //       in place that only pictures that use the
-    //       root coordinate system are cached - once
-    //       we relax that, we'll need to consider some
-    //       extra parameters, depending on transform.
-
-    // This is a globally unique id of the scene this picture
-    // is associated with, to avoid picture id collisions.
-    scene_id: u64,
-
-    // The unique (for the scene_id) identifier for this picture.
-    // TODO(gw): Currently, these will not be
-    //           shared across new display lists,
-    //           so will only remain valid during
-    //           scrolling. Next step will be to
-    //           allow deep comparisons on pictures
-    //           between display lists, allowing
-    //           pictures that are the same to be
-    //           cached across display lists!
-    picture_id: PictureId,
-
-    // Store the rect within the unclipped device
-    // rect that we are actually rendering. This ensures
-    // that if the 'clipped' rect changes, we will see
-    // that the cache is invalid and re-draw the picture.
-    // TODO(gw): To reduce the number of invalidations that
-    //           happen as a cached picture scrolls off-screen,
-    //           we could round up the size of the off-screen
-    //           targets we draw (e.g. 512 pixels). This may
-    //           also simplify other parts of the code that
-    //           deal with clipped/unclipped rects, such as
-    //           the code to inflate the device rect for blurs.
-    pic_relative_render_rect: PictureIntRect,
-
-    // Ensure that if the overall size of the picture
-    // changes, the cache key will not match. This can
-    // happen, for example, during zooming or changes
-    // in device-pixel-ratio.
-    unclipped_size: DeviceIntSize,
-}
-
 /// Enum value describing the place of a picture in a 3D context.
 #[derive(Clone, Debug)]
 pub enum Picture3DContext<C> {
@@ -491,6 +439,9 @@ pub struct PicturePrimitive {
 
     /// Local clip rect for this picture.
     pub local_clip_rect: LayoutRect,
+
+    /// A descriptor for this surface that can be used as a cache key.
+    surface_desc: Option<SurfaceDescriptor>,
 }
 
 impl PicturePrimitive {
@@ -530,8 +481,32 @@ impl PicturePrimitive {
         prim_list: PrimitiveList,
         spatial_node_index: SpatialNodeIndex,
         local_clip_rect: LayoutRect,
+        clip_store: &ClipStore,
     ) -> Self {
+        // For now, only create a cache descriptor for blur filters (which
+        // includes text shadows). We can incrementally expand this to
+        // handle more composite modes.
+        let create_cache_descriptor = match requested_composite_mode {
+            Some(PictureCompositeMode::Filter(FilterOp::Blur(blur_radius))) => {
+                blur_radius > 0.0
+            }
+            Some(_) | None => {
+                false
+            }
+        };
+
+        let surface_desc = if create_cache_descriptor {
+            SurfaceDescriptor::new(
+                &prim_list.prim_instances,
+                spatial_node_index,
+                clip_store,
+            )
+        } else {
+            None
+        };
+
         PicturePrimitive {
+            surface_desc,
             prim_list,
             state: None,
             secondary_render_task_id: None,
@@ -617,7 +592,6 @@ impl PicturePrimitive {
         };
 
         let state = PictureState {
-            has_non_root_coord_system: false,
             is_cacheable: true,
             local_rect_changed: false,
             map_local_to_pic,
@@ -845,6 +819,12 @@ impl PicturePrimitive {
                 //                         local_scale.is_some();
                 let establishes_raster_root = xf.has_perspective_component();
 
+                // TODO(gw): For now, we always raster in screen space. Soon,
+                //           we will be able to respect the requested raster
+                //           space, and/or override the requested raster root
+                //           if it makes sense to.
+                let raster_space = RasterSpace::Screen;
+
                 let raster_spatial_node_index = if establishes_raster_root {
                     surface_spatial_node_index
                 } else {
@@ -865,6 +845,17 @@ impl PicturePrimitive {
                     surface_index,
                 });
 
+                // If we have a cache key / descriptor for this surface,
+                // update any transforms it cares about.
+                if let Some(ref mut surface_desc) = self.surface_desc {
+                    surface_desc.update(
+                        surface_spatial_node_index,
+                        raster_spatial_node_index,
+                        frame_context.clip_scroll_tree,
+                        raster_space,
+                    );
+                }
+
                 surface_index
             }
             None => {
@@ -1054,34 +1045,53 @@ impl PicturePrimitive {
                 let blur_std_deviation = blur_radius * frame_context.device_pixel_scale.0;
                 let blur_range = (blur_std_deviation * BLUR_SAMPLE_SCALE).ceil() as i32;
 
-                // The clipped field is the part of the picture that is visible
-                // on screen. The unclipped field is the screen-space rect of
-                // the complete picture, if no screen / clip-chain was applied
-                // (this includes the extra space for blur region). To ensure
-                // that we draw a large enough part of the picture to get correct
-                // blur results, inflate that clipped area by the blur range, and
-                // then intersect with the total screen rect, to minimize the
-                // allocation size.
-                let device_rect = clipped
-                    .inflate(blur_range, blur_range)
-                    .intersection(&unclipped.to_i32())
-                    .unwrap();
+                // We need to choose whether to cache this picture, or draw
+                // it into a temporary render target each frame. If we draw
+                // it into a persistently cached texture, then we want to
+                // draw the whole picture, without clipping it to the screen
+                // dimensions, so that it can be reused as it scrolls into
+                // view etc. However, if the unclipped size of the surface is
+                // too big, then it will be very expensive to draw, and may
+                // even be bigger than the maximum hardware render target
+                // size. In these cases, it's probably best to not cache the
+                // picture, and just draw a minimal portion of the picture
+                // (clipped to screen bounds) to a temporary target each frame.
 
-                let uv_rect_kind = calculate_uv_rect_kind(
-                    &pic_rect,
-                    &transform,
-                    &device_rect,
-                    frame_context.device_pixel_scale,
-                );
+                // TODO(gw): This size is quite arbitrary - we should do some
+                //           profiling / telemetry to see when it makes sense
+                //           to cache a picture.
+                const MAX_CACHE_SIZE: f32 = 2048.0;
+                let too_big_to_cache = unclipped.size.width > MAX_CACHE_SIZE ||
+                                       unclipped.size.height > MAX_CACHE_SIZE;
 
-                // If we are drawing a blur that has primitives or clips that contain
-                // a complex coordinate system, don't bother caching them (for now).
-                // It's likely that they are animating and caching may not help here
-                // anyway. In the future we should relax this a bit, so that we can
-                // cache tasks with complex coordinate systems if we detect the
-                // relevant transforms haven't changed from frame to frame.
-                if pic_state_for_children.has_non_root_coord_system ||
+                // If we can't create a valid cache key for this descriptor (e.g.
+                // due to it referencing old non-interned style primitives), then
+                // don't try to cache it.
+                let has_valid_cache_key = self.surface_desc.is_some();
+
+                if !has_valid_cache_key ||
+                   too_big_to_cache ||
                    !pic_state_for_children.is_cacheable {
+                    // The clipped field is the part of the picture that is visible
+                    // on screen. The unclipped field is the screen-space rect of
+                    // the complete picture, if no screen / clip-chain was applied
+                    // (this includes the extra space for blur region). To ensure
+                    // that we draw a large enough part of the picture to get correct
+                    // blur results, inflate that clipped area by the blur range, and
+                    // then intersect with the total screen rect, to minimize the
+                    // allocation size.
+                    let device_rect = clipped
+                        .inflate(blur_range, blur_range)
+                        .intersection(&unclipped.to_i32())
+                        .unwrap();
+
+                    let uv_rect_kind = calculate_uv_rect_kind(
+                        &pic_rect,
+                        &transform,
+                        &device_rect,
+                        frame_context.device_pixel_scale,
+                    );
+
                     let picture_task = RenderTask::new_picture(
                         RenderTaskLocation::Dynamic(None, device_rect.size),
                         unclipped.size,
@@ -1108,30 +1118,29 @@ impl PicturePrimitive {
 
                     PictureSurface::RenderTask(render_task_id)
                 } else {
-                    // Get the relative clipped rect within the overall prim rect, that
-                    // forms part of the cache key.
-                    let pic_relative_render_rect = PictureIntRect::new(
-                        PictureIntPoint::new(
-                            device_rect.origin.x - unclipped.origin.x as i32,
-                            device_rect.origin.y - unclipped.origin.y as i32,
-                        ),
-                        PictureIntSize::new(
-                            device_rect.size.width,
-                            device_rect.size.height,
-                        ),
-                    );
-
                     // Request a render task that will cache the output in the
                     // texture cache.
+                    let device_rect = unclipped.to_i32();
+
+                    let uv_rect_kind = calculate_uv_rect_kind(
+                        &pic_rect,
+                        &transform,
+                        &device_rect,
+                        frame_context.device_pixel_scale,
+                    );
+
+                    // TODO(gw): Probably worth changing the render task caching API
+                    //           so that we don't need to always clone the key.
+                    let cache_key = self.surface_desc
+                        .as_ref()
+                        .expect("bug: no cache key for surface")
+                        .cache_key
+                        .clone();
+
                     let cache_item = frame_state.resource_cache.request_render_task(
                         RenderTaskCacheKey {
                             size: device_rect.size,
-                            kind: RenderTaskCacheKeyKind::Picture(PictureCacheKey {
-                                scene_id: frame_context.scene_id,
-                                picture_id: self.id,
-                                unclipped_size: unclipped.size.to_i32(),
-                                pic_relative_render_rect,
-                            }),
+                            kind: RenderTaskCacheKeyKind::Picture(cache_key),
                         },
                         frame_state.gpu_cache,
                         frame_state.render_tasks,
diff --git a/gfx/webrender/src/prim_store.rs b/gfx/webrender/src/prim_store.rs
index cf8fa4ba8eec..4e09eff4ca91 100644
--- a/gfx/webrender/src/prim_store.rs
+++ b/gfx/webrender/src/prim_store.rs
@@ -11,7 +11,7 @@ use api::{DeviceIntSideOffsets, WorldPixel, BoxShadowClipMode, NormalBorder, Wor
 use api::{PicturePixel, RasterPixel, ColorDepth, LineStyle, LineOrientation, LayoutSizeAu, AuHelpers, LayoutVector2DAu};
 use app_units::Au;
 use border::{get_max_scale_for_border, build_border_instances, create_normal_border_prim};
-use clip_scroll_tree::{ClipScrollTree, CoordinateSystemId, SpatialNodeIndex};
+use clip_scroll_tree::{ClipScrollTree, SpatialNodeIndex};
 use clip::{ClipNodeFlags, ClipChainId, ClipChainInstance, ClipItem, ClipNodeCollector};
 use euclid::{TypedTransform3D, TypedRect, TypedScale};
 use frame_builder::{FrameBuildingContext, FrameBuildingState, PictureContext, PictureState};
@@ -121,6 +121,39 @@ pub enum CoordinateSpaceMapping<F, T> {
     Transform(TypedTransform3D<f32, F, T>),
 }
 
+impl<F, T> CoordinateSpaceMapping<F, T> {
+    pub fn new(
+        ref_spatial_node_index: SpatialNodeIndex,
+        target_node_index: SpatialNodeIndex,
+        clip_scroll_tree: &ClipScrollTree,
+    ) -> Self {
+        let spatial_nodes = &clip_scroll_tree.spatial_nodes;
+        let ref_spatial_node = &spatial_nodes[ref_spatial_node_index.0];
+        let target_spatial_node = &spatial_nodes[target_node_index.0];
+
+        if ref_spatial_node_index == target_node_index {
+            CoordinateSpaceMapping::Local
+        } else if ref_spatial_node.coordinate_system_id == target_spatial_node.coordinate_system_id {
+            CoordinateSpaceMapping::ScaleOffset(
+                ref_spatial_node.coordinate_system_relative_scale_offset
+                    .inverse()
+                    .accumulate(
+                        &target_spatial_node.coordinate_system_relative_scale_offset
+                    )
+            )
+        } else {
+            let transform = clip_scroll_tree.get_relative_transform(
+                target_node_index,
+                ref_spatial_node_index,
+            ).expect("bug: should have already been culled");
+
+            CoordinateSpaceMapping::Transform(
+                transform.with_source::<F>().with_destination::<T>()
+            )
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct SpaceMapper<F, T> {
     kind: CoordinateSpaceMapping<F, T>,
@@ -159,31 +192,13 @@ impl<F, T> SpaceMapper<F, T> where F: fmt::Debug {
         clip_scroll_tree: &ClipScrollTree,
     ) {
         if target_node_index != self.current_target_spatial_node_index {
-            let spatial_nodes = &clip_scroll_tree.spatial_nodes;
-            let ref_spatial_node = &spatial_nodes[self.ref_spatial_node_index.0];
-            let target_spatial_node = &spatial_nodes[target_node_index.0];
             self.current_target_spatial_node_index = target_node_index;
 
-            self.kind = if self.ref_spatial_node_index == target_node_index {
-                CoordinateSpaceMapping::Local
-            } else if ref_spatial_node.coordinate_system_id == target_spatial_node.coordinate_system_id {
-                CoordinateSpaceMapping::ScaleOffset(
-                    ref_spatial_node.coordinate_system_relative_scale_offset
-                        .inverse()
-                        .accumulate(
-                            &target_spatial_node.coordinate_system_relative_scale_offset
-                        )
-                )
-            } else {
-                let transform = clip_scroll_tree.get_relative_transform(
-                    target_node_index,
-                    self.ref_spatial_node_index,
-                ).expect("bug: should have already been culled");
-
-                CoordinateSpaceMapping::Transform(
-                    transform.with_source::<F>().with_destination::<T>()
-                )
-            };
+            self.kind = CoordinateSpaceMapping::new(
+                self.ref_spatial_node_index,
+                target_node_index,
+                clip_scroll_tree,
+            );
         }
     }
 
@@ -580,13 +595,14 @@ impl PrimitiveTemplate {
 // Type definitions for interning primitives.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, Hash, Eq, PartialEq)]
 pub struct PrimitiveDataMarker;
 
 pub type PrimitiveDataStore = intern::DataStore<PrimitiveKey, PrimitiveTemplate, PrimitiveDataMarker>;
 pub type PrimitiveDataHandle = intern::Handle<PrimitiveDataMarker>;
 pub type PrimitiveDataUpdateList = intern::UpdateList<PrimitiveKey>;
 pub type PrimitiveDataInterner = intern::Interner<PrimitiveKey, PrimitiveSceneData, PrimitiveDataMarker>;
+pub type PrimitiveUid = intern::ItemUid<PrimitiveDataMarker>;
 
 // Maintains a list of opacity bindings that have been collapsed into
 // the color of a single primitive. This is an important optimization
@@ -2137,8 +2153,6 @@ impl PrimitiveStore {
             Some((pic_context_for_children, mut pic_state_for_children, mut prim_list)) => {
                 // Mark whether this picture has a complex coordinate system.
                 let is_passthrough = pic_context_for_children.is_passthrough;
-                pic_state_for_children.has_non_root_coord_system |=
-                    prim_context.spatial_node.coordinate_system_id != CoordinateSystemId::root();
 
                 self.prepare_primitives(
                     &mut prim_list,
@@ -2259,8 +2273,6 @@ impl PrimitiveStore {
                 );
             }
 
-            pic_state.has_non_root_coord_system |= clip_chain.has_non_root_coord_system;
-
             prim_instance.combined_local_clip_rect = if pic_context.apply_local_clip_rect {
                 clip_chain.local_clip_rect
             } else {
@@ -2455,11 +2467,6 @@ impl PrimitiveStore {
                 prim_instance.spatial_node_index,
             );
 
-            // Mark whether this picture contains any complex coordinate
-            // systems, due to either the scroll node or the clip-chain.
-            pic_state.has_non_root_coord_system |=
-                spatial_node.coordinate_system_id != CoordinateSystemId::root();
-
             pic_state.map_local_to_pic.set_target_spatial_node(
                 prim_instance.spatial_node_index,
                 frame_context.clip_scroll_tree,
diff --git a/gfx/webrender/src/render_backend.rs b/gfx/webrender/src/render_backend.rs
index 1352f051d0c9..81b9903a1a60 100644
--- a/gfx/webrender/src/render_backend.rs
+++ b/gfx/webrender/src/render_backend.rs
@@ -477,7 +477,6 @@ struct PlainRenderBackend {
     frame_config: FrameBuilderConfig,
     documents: FastHashMap<DocumentId, DocumentView>,
     resources: PlainResources,
-    last_scene_id: u64,
 }
 
 /// The render backend is responsible for transforming high level display lists into
@@ -507,8 +506,6 @@ pub struct RenderBackend {
     sampler: Option<Box<AsyncPropertySampler + Send>>,
     size_of_op: Option<VoidPtrToSizeFn>,
     namespace_alloc_by_client: bool,
-
-    last_scene_id: u64,
 }
 
 impl RenderBackend {
@@ -545,7 +542,6 @@ impl RenderBackend {
             recorder,
             sampler,
             size_of_op,
-            last_scene_id: 0,
             namespace_alloc_by_client,
         }
     }
@@ -658,12 +654,6 @@ impl RenderBackend {
         IdNamespace(NEXT_NAMESPACE_ID.fetch_add(1, Ordering::Relaxed) as u32)
     }
 
-    pub fn make_unique_scene_id(&mut self) -> u64 {
-        // 2^64 scenes ought to be enough for anybody!
-        self.last_scene_id += 1;
-        self.last_scene_id
-    }
-
     pub fn run(&mut self, mut profile_counters: BackendProfileCounters) {
         let mut frame_counter: u32 = 0;
         let mut keep_going = true;
@@ -1046,7 +1036,6 @@ impl RenderBackend {
             return;
         }
 
-        let scene_id = self.make_unique_scene_id();
         let doc = self.documents.get_mut(&document_id).unwrap();
 
         if txn.should_build_scene() {
@@ -1054,7 +1043,6 @@ impl RenderBackend {
                 view: doc.view.clone(),
                 font_instances: self.resource_cache.get_font_instances(),
                 output_pipelines: doc.output_pipelines.clone(),
-                scene_id,
             });
         }
 
@@ -1448,7 +1436,6 @@ impl RenderBackend {
                 .map(|(id, doc)| (*id, doc.view.clone()))
                 .collect(),
             resources,
-            last_scene_id: self.last_scene_id,
         };
 
         config.serialize(&backend, "backend");
@@ -1509,7 +1496,6 @@ impl RenderBackend {
 
         let mut scenes_to_build = Vec::new();
 
-        let mut last_scene_id = backend.last_scene_id;
         for (id, view) in backend.documents {
             debug!("\tdocument {:?}", id);
             let scene_name = format!("scene-{}-{}", (id.0).0, id.1);
@@ -1568,8 +1554,6 @@ impl RenderBackend {
                 None => true,
             };
 
-            last_scene_id += 1;
-
             scenes_to_build.push(LoadScene {
                 document_id: id,
                 scene: doc.scene.clone(),
@@ -1577,7 +1561,6 @@ impl RenderBackend {
                 config: self.frame_config.clone(),
                 output_pipelines: doc.output_pipelines.clone(),
                 font_instances: self.resource_cache.get_font_instances(),
-                scene_id: last_scene_id,
                 build_frame,
                 doc_resources,
             });
diff --git a/gfx/webrender/src/render_task.rs b/gfx/webrender/src/render_task.rs
index 46780473ef34..cd8d1430b4ef 100644
--- a/gfx/webrender/src/render_task.rs
+++ b/gfx/webrender/src/render_task.rs
@@ -21,13 +21,13 @@ use gpu_types::{BorderInstance, ImageSource, UvRectKind};
 use internal_types::{CacheTextureId, FastHashMap, LayerIndex, SavedTargetIndex};
 #[cfg(feature = "pathfinder")]
 use pathfinder_partitioner::mesh::Mesh;
-use picture::PictureCacheKey;
 use prim_store::{PictureIndex, ImageCacheKey, LineDecorationCacheKey};
 #[cfg(feature = "debugger")]
 use print_tree::{PrintTreePrinter};
 use render_backend::FrameId;
 use resource_cache::{CacheItem, ResourceCache};
-use std::{cmp, ops, usize, f32, i32};
+use surface::SurfaceCacheKey;
+use std::{cmp, ops, mem, usize, f32, i32};
 use texture_cache::{TextureCache, TextureCacheHandle, Eviction};
 use tiling::{RenderPass, RenderTargetIndex};
 use tiling::{RenderTargetKind};
@@ -1076,7 +1076,7 @@ pub enum RenderTaskCacheKeyKind {
     Image(ImageCacheKey),
     #[allow(dead_code)]
     Glyph(GpuGlyphCacheKey),
-    Picture(PictureCacheKey),
+    Picture(SurfaceCacheKey),
     BorderEdge(BorderEdgeCacheKey),
     BorderCorner(BorderCornerCacheKey),
     LineDecoration(LineDecorationCacheKey),
@@ -1145,19 +1145,18 @@ impl RenderTaskCache {
         // Nonetheless, we should remove stale entries
         // from here so that this hash map doesn't
         // grow indefinitely!
-        let mut keys_to_remove = Vec::new();
+        let cache_entries = &mut self.cache_entries;
 
-        for (key, handle) in &self.map {
-            let entry = self.cache_entries.get(handle);
-            if !texture_cache.is_allocated(&entry.handle) {
-                keys_to_remove.push(key.clone())
+        self.map.retain(|_, handle| {
+            let retain = texture_cache.is_allocated(
+                &cache_entries.get(handle).handle,
+            );
+            if !retain {
+                let handle = mem::replace(handle, FreeListHandle::invalid());
+                cache_entries.free(handle);
             }
-        }
-
-        for key in &keys_to_remove {
-            let handle = self.map.remove(key).unwrap();
-            self.cache_entries.free(handle);
-        }
+            retain
+        });
     }
 
     pub fn update(
diff --git a/gfx/webrender/src/scene_builder.rs b/gfx/webrender/src/scene_builder.rs
index 144389454ec3..fae138d3b70e 100644
--- a/gfx/webrender/src/scene_builder.rs
+++ b/gfx/webrender/src/scene_builder.rs
@@ -97,14 +97,12 @@ pub struct SceneRequest {
     pub view: DocumentView,
     pub font_instances: FontInstanceMap,
     pub output_pipelines: FastHashSet<PipelineId>,
-    pub scene_id: u64,
 }
 
 #[cfg(feature = "replay")]
 pub struct LoadScene {
     pub document_id: DocumentId,
     pub scene: Scene,
-    pub scene_id: u64,
     pub output_pipelines: FastHashSet<PipelineId>,
     pub font_instances: FontInstanceMap,
     pub view: DocumentView,
@@ -330,7 +328,6 @@ impl SceneBuilder {
                     &item.output_pipelines,
                     &self.config,
                     &mut new_scene,
-                    item.scene_id,
                     &mut self.picture_id_generator,
                     &mut item.doc_resources,
                 );
@@ -435,7 +432,6 @@ impl SceneBuilder {
                     &request.output_pipelines,
                     &self.config,
                     &mut new_scene,
-                    request.scene_id,
                     &mut self.picture_id_generator,
                     &mut doc.resources,
                 );
diff --git a/gfx/webrender/src/surface.rs b/gfx/webrender/src/surface.rs
new file mode 100644
index 000000000000..541d3034e52f
--- /dev/null
+++ b/gfx/webrender/src/surface.rs
@@ -0,0 +1,331 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+use api::{LayoutPixel, PicturePixel, RasterSpace};
+use clip::{ClipChainId, ClipStore, ClipUid};
+use clip_scroll_tree::{ClipScrollTree, SpatialNodeIndex};
+use euclid::TypedTransform3D;
+use internal_types::FastHashSet;
+use prim_store::{CoordinateSpaceMapping, PrimitiveUid, PrimitiveInstance, PrimitiveInstanceKind};
+use std::hash;
+use util::ScaleOffset;
+
+/*
+
+    Notes for future implementation work on surface caching:
+
+    State that can affect the contents of a cached surface:
+
+        Primitives
+            These are handled by the PrimitiveUid value. The structure interning
+            code during scene building guarantees that each PrimitiveUid will
+            represent a unique identifier for the content of this primitive.
+        Clip chains
+            Similarly, the ClipUid value uniquely identifies the contents of
+            a clip node.
+        Transforms
+            Each picture contains a list of transforms that affect the content
+            of the picture itself. The value of the surface transform relative
+            to the raster root transform is only relevant if the picture is
+            being rasterized in screen-space.
+        External images
+            An external image (e.g. video) can change the contents of a picture
+            without a scene build occurring. We don't need to handle this yet,
+            but once images support interning and caching, we'll need to include
+            a list of external image dependencies in the cache key.
+        Property animation
+            Transform animations are handled by the transforms case above. We don't
+            need to handle opacity animations yet, since the interning and picture
+            caching doesn't support images and / or solid rects. Once those
+            primitives are ported, we'll need a list of property animation keys
+            that a surface depends on.
+
+*/
+
+// Matches the definition of SK_ScalarNearlyZero in Skia.
+// TODO(gw): Some testing to see what's reasonable for this value
+//           to avoid invalidating the cache for minor changes.
+const QUANTIZE_SCALE: f32 = 4096.0;
+
+fn quantize(value: f32) -> f32 {
+    (value * QUANTIZE_SCALE).round() / QUANTIZE_SCALE
+}
+
+/// A quantized, hashable version of util::ScaleOffset that
+/// can be used as a cache key.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Debug, PartialEq, Clone)]
+pub struct ScaleOffsetKey {
+    scale_x: f32,
+    scale_y: f32,
+    offset_x: f32,
+    offset_y: f32,
+}
+
+impl ScaleOffsetKey {
+    fn new(scale_offset: &ScaleOffset) -> Self {
+        // TODO(gw): Since these are quantized, it might make sense in the future to
+        //           convert these to ints to remove the need for custom hash impl.
+        ScaleOffsetKey {
+            scale_x: quantize(scale_offset.scale.x),
+            scale_y: quantize(scale_offset.scale.y),
+            offset_x: quantize(scale_offset.offset.x),
+            offset_y: quantize(scale_offset.offset.y),
+        }
+    }
+}
+
+impl Eq for ScaleOffsetKey {}
+
+impl hash::Hash for ScaleOffsetKey {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) {
+        self.scale_x.to_bits().hash(state);
+        self.scale_y.to_bits().hash(state);
+        self.offset_x.to_bits().hash(state);
+        self.offset_y.to_bits().hash(state);
+    }
+}
+
+/// A quantized, hashable version of PictureTransform that
+/// can be used as a cache key.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Debug, PartialEq, Clone)]
+pub struct MatrixKey {
+    values: [f32; 16],
+}
+
+impl MatrixKey {
+    fn new<Src, Dst>(transform: &TypedTransform3D<f32, Src, Dst>) -> Self {
+        let mut values = transform.to_row_major_array();
+
+        // TODO(gw): Since these are quantized, it might make sense in the future to
+        //           convert these to ints to remove the need for custom hash impl.
+        for value in &mut values {
+            *value = quantize(*value);
+        }
+
+        MatrixKey {
+            values,
+        }
+    }
+}
+
+impl Eq for MatrixKey {}
+
+impl hash::Hash for MatrixKey {
+    fn hash<H: hash::Hasher>(&self, state: &mut H) {
+        for value in &self.values {
+            value.to_bits().hash(state);
+        }
+    }
+}
+
+/// A quantized, hashable version of CoordinateSpaceMapping that
+/// can be used as a cache key.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Debug, PartialEq, Clone, Hash, Eq)]
+pub enum TransformKey {
+    Local,
+    ScaleOffset(ScaleOffsetKey),
+    Transform(MatrixKey),
+}
+
+impl TransformKey {
+    pub fn local() -> Self {
+        TransformKey::Local
+    }
+}
+
+impl<F, T> From<CoordinateSpaceMapping<F, T>> for TransformKey {
+    /// Construct a transform cache key from a coordinate space mapping.
+    fn from(mapping: CoordinateSpaceMapping<F, T>) -> TransformKey {
+        match mapping {
+            CoordinateSpaceMapping::Local => {
+                TransformKey::Local
+            }
+            CoordinateSpaceMapping::ScaleOffset(ref scale_offset) => {
+                TransformKey::ScaleOffset(ScaleOffsetKey::new(scale_offset))
+            }
+            CoordinateSpaceMapping::Transform(ref transform) => {
+                TransformKey::Transform(MatrixKey::new(transform))
+            }
+        }
+    }
+}
+
+/// This key uniquely identifies the contents of a cached
+/// picture surface.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+#[derive(Debug, Eq, PartialEq, Hash, Clone)]
+pub struct SurfaceCacheKey {
+    /// The list of primitives that are part of this surface.
+    /// The uid uniquely identifies the content of the primitive.
+    pub primitive_ids: Vec<PrimitiveUid>,
+    /// The list of clips that affect the primitives on this surface.
+    /// The uid uniquely identifies the content of the clip.
+    pub clip_ids: Vec<ClipUid>,
+    /// A list of transforms that can affect the contents of primitives
+    /// and/or clips on this picture surface.
+    pub transforms: Vec<TransformKey>,
+    /// Information about the transform of the picture surface itself. If we are
+    /// drawing in screen-space, then the value of this affects the contents
+    /// of the cached surface. If we're drawing in local space, then the transform
+    /// of the surface in its parent is not relevant to the contents.
+    pub raster_transform: TransformKey,
+}
+
+/// A descriptor for the contents of a picture surface.
+#[cfg_attr(feature = "capture", derive(Serialize))]
+#[cfg_attr(feature = "replay", derive(Deserialize))]
+pub struct SurfaceDescriptor {
+    /// The cache key identifies the contents or primitives, clips and the current
+    /// state of relevant transforms.
+    pub cache_key: SurfaceCacheKey,
+
+    /// The spatial nodes array is used to update the cache key each frame, without
+    /// relying on the value of a spatial node index (these may change, if other parts of the
+    /// display list result in a different clip-scroll tree).
+    pub spatial_nodes: Vec<SpatialNodeIndex>,
+}
+
+impl SurfaceDescriptor {
+    /// Construct a new surface descriptor for this list of primitives.
+    /// This method is fallible - it will return None if this picture
+    /// contains primitives that can't currently be cached safely.
+    pub fn new(
+        prim_instances: &[PrimitiveInstance],
+        pic_spatial_node_index: SpatialNodeIndex,
+        clip_store: &ClipStore,
+    ) -> Option<Self> {
+        let mut relevant_spatial_nodes = FastHashSet::default();
+        let mut primitive_ids = Vec::new();
+        let mut clip_ids = Vec::new();
+
+        for prim_instance in prim_instances {
+            // If the prim has the same spatial node as the surface,
+            // then the content can't move relative to it, so we don't
+            // care if the transform changes.
+            if pic_spatial_node_index != prim_instance.spatial_node_index {
+                relevant_spatial_nodes.insert(prim_instance.spatial_node_index);
+            }
+
+            // Collect clip node transforms that we care about.
+            let mut clip_chain_id = prim_instance.clip_chain_id;
+            while clip_chain_id != ClipChainId::NONE {
+                let clip_chain_node = &clip_store.clip_chain_nodes[clip_chain_id.0 as usize];
+
+                // TODO(gw): This needs to be a bit more careful once we create
+                //           descriptors for pictures that might be pass-through.
+
+                // Ignore clip chain nodes that will be handled by the clip node collector.
+                if clip_chain_node.spatial_node_index > pic_spatial_node_index {
+                    relevant_spatial_nodes.insert(prim_instance.spatial_node_index);
+
+                    clip_ids.push(clip_chain_node.handle.uid());
+                }
+
+                clip_chain_id = clip_chain_node.parent_clip_chain_id;
+            }
+
+            // For now, we only handle interned primitives. If we encounter
+            // a legacy primitive or picture, then fail to create a cache
+            // descriptor.
+            match prim_instance.kind {
+                PrimitiveInstanceKind::Picture { .. } |
+                PrimitiveInstanceKind::LegacyPrimitive { .. } => {
+                    return None;
+                }
+                PrimitiveInstanceKind::LineDecoration { .. } |
+                PrimitiveInstanceKind::TextRun { .. } |
+                PrimitiveInstanceKind::Clear => {}
+            }
+
+            // Record the unique identifier for the content represented
+            // by this primitive.
+            primitive_ids.push(prim_instance.prim_data_handle.uid());
+        }
+
+        // Get a list of spatial nodes that are relevant for the contents
+        // of this picture. Sort them to ensure that for a given clip-scroll
+        // tree, we end up with the same transform ordering.
+        let mut spatial_nodes: Vec<SpatialNodeIndex> = relevant_spatial_nodes
+            .into_iter()
+            .collect();
+        spatial_nodes.sort();
+
+        // Create the array of transform values that gets built each
+        // frame during update.
+        let transforms = vec![TransformKey::local(); spatial_nodes.len()];
+
+        let cache_key = SurfaceCacheKey {
+            primitive_ids,
+            clip_ids,
+            transforms,
+            raster_transform: TransformKey::local(),
+        };
+
+        Some(SurfaceDescriptor {
+            cache_key,
+            spatial_nodes,
+        })
+    }
+
+    /// Update the transforms for this cache key, by extracting the current
+    /// values from the clip-scroll tree state.
+    pub fn update(
+        &mut self,
+        surface_spatial_node_index: SpatialNodeIndex,
+        raster_spatial_node_index: SpatialNodeIndex,
+        clip_scroll_tree: &ClipScrollTree,
+        raster_space: RasterSpace,
+    ) {
+        // Update the state of the transform for compositing this picture.
+        self.cache_key.raster_transform = match raster_space {
+            RasterSpace::Screen => {
+                // In general cases, if we're rasterizing a picture in screen space, then the
+                // value of the surface spatial node will affect the contents of the picture
+                // itself. However, if the surface and raster spatial nodes are in the same
+                // coordinate system (which is the common case!) then we are effectively drawing
+                // in a local space anyway, so don't care about that transform for the purposes
+                // of validating the surface cache contents.
+                let raster_spatial_node = &clip_scroll_tree.spatial_nodes[raster_spatial_node_index.0];
+                let surface_spatial_node = &clip_scroll_tree.spatial_nodes[surface_spatial_node_index.0];
+
+                let mut key = CoordinateSpaceMapping::<LayoutPixel, PicturePixel>::new(
+                    raster_spatial_node_index,
+                    surface_spatial_node_index,
+                    clip_scroll_tree,
+                ).into();
+
+                if let TransformKey::ScaleOffset(ref mut key) = key {
+                    if raster_spatial_node.coordinate_system_id == surface_spatial_node.coordinate_system_id {
+                        key.offset_x = 0.0;
+                        key.offset_y = 0.0;
+                    }
+                }
+
+                key
+            }
+            RasterSpace::Local(..) => {
+                TransformKey::local()
+            }
+        };
+
+        // Update the state of any relevant transforms for this picture.
+        for (spatial_node_index, transform) in self.spatial_nodes
+            .iter()
+            .zip(self.cache_key.transforms.iter_mut())
+        {
+            *transform = CoordinateSpaceMapping::<LayoutPixel, PicturePixel>::new(
+                raster_spatial_node_index,
+                *spatial_node_index,
+                clip_scroll_tree,
+            ).into();
+        }
+    }
+}
diff --git a/gfx/webrender_bindings/revision.txt b/gfx/webrender_bindings/revision.txt
index cafbd16f00d3..e7c02c8edde0 100644
--- a/gfx/webrender_bindings/revision.txt
+++ b/gfx/webrender_bindings/revision.txt
@@ -1 +1 @@
-6e445b0422075f66be4a2009745cad3fefe3429f
+b8829189cfc1769550c9ab4a4bb994e28621f009

From ebeab3ee4691a5a415d3a555da578b5eed1a0528 Mon Sep 17 00:00:00 2001
From: Sebastian Hengst <archaeopteryx@coole-files.de>
Date: Thu, 8 Nov 2018 17:54:22 +0000
Subject: [PATCH 31/77] Bug 1505829 - use bugzilla component 'Javascript: Web
 Assembly' for wpt's wasm tests r=bbouvier

Differential Revision: https://phabricator.services.mozilla.com/D11343

--HG--
extra : moz-landing-system : lando
---
 testing/web-platform/moz.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/web-platform/moz.build b/testing/web-platform/moz.build
index 83b231f67aa0..189d7b35ad20 100644
--- a/testing/web-platform/moz.build
+++ b/testing/web-platform/moz.build
@@ -78,7 +78,7 @@ with Files("mozilla/tests/placeholder"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
 
 with Files("mozilla/tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "JavaScript Engine: JIT")
+    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
 
 with Files("update/**"):
     BUG_COMPONENT = ("Testing", "web-platform-tests")
@@ -536,7 +536,7 @@ with Files("tests/wai-aria/**"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("tests/wasm/**"):
-    BUG_COMPONENT = ("Core", "JavaScript Engine: JIT")
+    BUG_COMPONENT = ("Core", "Javascript: Web Assembly")
 
 with Files("tests/web-animations/**"):
     BUG_COMPONENT = ("Core", "DOM: Animation")

From 49f92aabe5a368bdd63c8759c3e408446f855a2b Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Thu, 8 Nov 2018 19:52:18 +0000
Subject: [PATCH 32/77] Bug 1504551 - Remove the XPCOM registration for
 "@mozilla.org/exslt/regexp;1" r=qdot

Differential Revision: https://phabricator.services.mozilla.com/D10847

--HG--
extra : moz-landing-system : lando
---
 browser/installer/package-manifest.in        |  2 -
 dom/xslt/moz.build                           |  6 --
 dom/xslt/txIEXSLTRegExFunctions.idl          | 21 -----
 dom/xslt/xslt/moz.build                      |  9 +-
 dom/xslt/xslt/txEXSLTFunctions.cpp           | 91 ++++++++++++++++----
 dom/xslt/xslt/txEXSLTRegExFunctions.js       | 51 -----------
 dom/xslt/xslt/txEXSLTRegExFunctions.jsm      | 40 +++++++++
 dom/xslt/xslt/txEXSLTRegExFunctions.manifest |  2 -
 mobile/android/installer/package-manifest.in |  2 -
 9 files changed, 116 insertions(+), 108 deletions(-)
 delete mode 100644 dom/xslt/txIEXSLTRegExFunctions.idl
 delete mode 100644 dom/xslt/xslt/txEXSLTRegExFunctions.js
 create mode 100644 dom/xslt/xslt/txEXSLTRegExFunctions.jsm
 delete mode 100644 dom/xslt/xslt/txEXSLTRegExFunctions.manifest

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 8b5a1a810d39..747a9790b019 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -240,8 +240,6 @@
 @RESPATH@/components/ContentProcessSingleton.js
 @RESPATH@/components/nsURLFormatter.manifest
 @RESPATH@/components/nsURLFormatter.js
-@RESPATH@/components/txEXSLTRegExFunctions.manifest
-@RESPATH@/components/txEXSLTRegExFunctions.js
 @RESPATH@/components/toolkitplaces.manifest
 @RESPATH@/components/nsLivemarkService.js
 @RESPATH@/components/nsTaggingService.js
diff --git a/dom/xslt/moz.build b/dom/xslt/moz.build
index 568919122376..c9b5839c95fa 100644
--- a/dom/xslt/moz.build
+++ b/dom/xslt/moz.build
@@ -7,12 +7,6 @@
 with Files("**"):
     BUG_COMPONENT = ("Core", "XSLT")
 
-XPIDL_SOURCES += [
-    'txIEXSLTRegExFunctions.idl',
-]
-
-XPIDL_MODULE = 'content_xslt'
-
 EXPORTS += [
     'nsIDocumentTransformer.h',
 ]
diff --git a/dom/xslt/txIEXSLTRegExFunctions.idl b/dom/xslt/txIEXSLTRegExFunctions.idl
deleted file mode 100644
index e91d166ad551..000000000000
--- a/dom/xslt/txIEXSLTRegExFunctions.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-webidl Document;
-webidl DocumentFragment;
-
-[scriptable, uuid(c180e993-aced-4839-95a0-ecd5ff138be9)]
-interface txIEXSLTRegExFunctions : nsISupports
-{
-    DocumentFragment match(in AString aString, in AString aRegEx,
-                           in AString aFlags,
-                           in Document aResultDocument);
-    AString replace(in AString aString, in AString aRegEx,
-                    in AString aFlags, in AString aReplace);
-    boolean test(in AString aString, in AString aRegEx,
-                 in AString aFlags);
-};
diff --git a/dom/xslt/xslt/moz.build b/dom/xslt/xslt/moz.build
index 245a5bc28fcd..c0aaa8ebf4d0 100644
--- a/dom/xslt/xslt/moz.build
+++ b/dom/xslt/xslt/moz.build
@@ -41,19 +41,16 @@ UNIFIED_SOURCES += [
     'txXSLTProcessor.cpp',
 ]
 
-EXTRA_COMPONENTS += [
-    'txEXSLTRegExFunctions.js',
-    'txEXSLTRegExFunctions.manifest',
+EXTRA_JS_MODULES += [
+    'txEXSLTRegExFunctions.jsm',
 ]
 
-# For nsAutoJSString
-LOCAL_INCLUDES += ["/dom/base"]
-
 LOCAL_INCLUDES += [
     '../base',
     '../xml',
     '../xpath',
     '/dom/base',
+    '/js/xpconnect/src',
 ]
 
 FINAL_LIBRARY = 'xul'
diff --git a/dom/xslt/xslt/txEXSLTFunctions.cpp b/dom/xslt/xslt/txEXSLTFunctions.cpp
index 195efdc520ad..7348993a294f 100644
--- a/dom/xslt/xslt/txEXSLTFunctions.cpp
+++ b/dom/xslt/xslt/txEXSLTFunctions.cpp
@@ -26,9 +26,9 @@
 #include "nsIContent.h"
 #include "txMozillaXMLOutput.h"
 #include "nsTextNode.h"
-#include "mozilla/dom/DocumentFragment.h"
+#include "mozilla/dom/DocumentFragmentBinding.h"
 #include "prtime.h"
-#include "txIEXSLTRegExFunctions.h"
+#include "xpcprivate.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
@@ -217,19 +217,13 @@ private:
 class txEXSLTRegExFunctionCall : public FunctionCall
 {
 public:
-    txEXSLTRegExFunctionCall(txEXSLTType aType, txIEXSLTRegExFunctions* aRegExService)
+    explicit txEXSLTRegExFunctionCall(txEXSLTType aType)
       : mType(aType)
-      , mRegExService(aRegExService)
     {}
 
     static bool Create(txEXSLTType aType, FunctionCall** aFunction)
     {
-      nsCOMPtr<txIEXSLTRegExFunctions> regExService =
-        do_GetService("@mozilla.org/exslt/regexp;1");
-      if (!regExService) {
-        return false;
-      }
-      *aFunction = new txEXSLTRegExFunctionCall(aType, regExService);
+      *aFunction = new txEXSLTRegExFunctionCall(aType);
       return true;
     }
 
@@ -237,7 +231,6 @@ public:
 
 private:
     txEXSLTType mType;
-    nsCOMPtr<txIEXSLTRegExFunctions> mRegExService;
 };
 
 nsresult
@@ -734,15 +727,56 @@ txEXSLTRegExFunctionCall::evaluate(txIEvalContext* aContext,
         NS_ENSURE_SUCCESS(rv, rv);
     }
 
+    AutoJSAPI jsapi;
+    if (!jsapi.Init(xpc::PrivilegedJunkScope())) {
+        return NS_ERROR_FAILURE;
+    }
+    JSContext* cx = jsapi.cx();
+
+    xpc::SandboxOptions options;
+    options.sandboxName.AssignLiteral("txEXSLTRegExFunctionCall sandbox");
+    options.invisibleToDebugger = true;
+    JS::RootedValue v(cx);
+    rv = CreateSandboxObject(cx, &v, nsXPConnect::SystemPrincipal(), options);
+    MOZ_ALWAYS_SUCCEEDS(rv);
+    JS::RootedObject sandbox(cx, js::UncheckedUnwrap(&v.toObject()));
+
+    JSAutoRealm ar(cx, sandbox);
+    ErrorResult er;
+    GlobalObject global(cx, sandbox);
+    JS::RootedObject obj(cx);
+    ChromeUtils::Import(global,
+                        NS_LITERAL_STRING("resource://gre/modules/txEXSLTRegExFunctions.jsm"),
+                        Optional<JS::HandleObject>(), &obj, er);
+    MOZ_ALWAYS_TRUE(!er.Failed());
+
+    JS::RootedString str(cx, JS_NewUCStringCopyZ(cx, PromiseFlatString(string).get()));
+    JS::RootedString re(cx, JS_NewUCStringCopyZ(cx, PromiseFlatString(regex).get()));
+    JS::RootedString fl(cx, JS_NewUCStringCopyZ(cx, PromiseFlatString(flags).get()));
+
     switch (mType) {
         case txEXSLTType::MATCH:
         {
             nsCOMPtr<nsIDocument> sourceDoc = getSourceDocument(aContext);
             NS_ENSURE_STATE(sourceDoc);
 
+            JS::RootedValue doc(cx);
+            if (!GetOrCreateDOMReflector(cx, sourceDoc, &doc)) {
+                return NS_ERROR_FAILURE;
+            }
+
+            JS::AutoValueArray<4> args(cx);
+            args[0].setString(str);
+            args[1].setString(re);
+            args[2].setString(fl);
+            args[3].setObject(doc.toObject());
+
+            JS::RootedValue rval(cx);
+            if (!JS_CallFunctionName(cx, sandbox, "match", args, &rval)) {
+                return NS_ERROR_FAILURE;
+            }
             RefPtr<DocumentFragment> docFrag;
-            rv = mRegExService->Match(string, regex, flags, sourceDoc,
-                                      getter_AddRefs(docFrag));
+            rv = UNWRAP_OBJECT(DocumentFragment, &rval, docFrag);
             NS_ENSURE_SUCCESS(rv, rv);
             NS_ENSURE_STATE(docFrag);
 
@@ -768,9 +802,22 @@ txEXSLTRegExFunctionCall::evaluate(txIEvalContext* aContext,
             rv = mParams[3]->evaluateToString(aContext, replace);
             NS_ENSURE_SUCCESS(rv, rv);
 
+            JS::RootedString repl(cx, JS_NewUCStringCopyZ(cx, PromiseFlatString(replace).get()));
+
+            JS::AutoValueArray<4> args(cx);
+            args[0].setString(str);
+            args[1].setString(re);
+            args[2].setString(fl);
+            args[3].setString(repl);
+
+            JS::RootedValue rval(cx);
+            if (!JS_CallFunctionName(cx, sandbox, "replace", args, &rval)) {
+                return NS_ERROR_FAILURE;
+            }
             nsString result;
-            rv = mRegExService->Replace(string, regex, flags, replace, result);
-            NS_ENSURE_SUCCESS(rv, rv);
+            if (!ConvertJSValueToString(cx, rval, result)) {
+                return NS_ERROR_FAILURE;
+            }
 
             rv = aContext->recycler()->getStringResult(result, aResult);
             NS_ENSURE_SUCCESS(rv, rv);
@@ -779,9 +826,17 @@ txEXSLTRegExFunctionCall::evaluate(txIEvalContext* aContext,
         }
         case txEXSLTType::TEST:
         {
-            bool result;
-            rv = mRegExService->Test(string, regex, flags, &result);
-            NS_ENSURE_SUCCESS(rv, rv);
+            JS::AutoValueArray<3> args(cx);
+            args[0].setString(str);
+            args[1].setString(re);
+            args[2].setString(fl);
+
+            JS::RootedValue rval(cx);
+            if (!JS_CallFunctionName(cx, sandbox, "test", args, &rval)) {
+                return NS_ERROR_FAILURE;
+            }
+
+            bool result = rval.toBoolean();
 
             aContext->recycler()->getBoolResult(result, aResult);
 
diff --git a/dom/xslt/xslt/txEXSLTRegExFunctions.js b/dom/xslt/xslt/txEXSLTRegExFunctions.js
deleted file mode 100644
index c658ca5b67b4..000000000000
--- a/dom/xslt/xslt/txEXSLTRegExFunctions.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-const EXSLT_REGEXP_CID = Components.ID("{18a03189-067b-4978-b4f1-bafe35292ed6}");
-
-function txEXSLTRegExFunctions()
-{
-}
-
-var SingletonInstance = null;
-
-txEXSLTRegExFunctions.prototype = {
-    classID: EXSLT_REGEXP_CID,
-
-    QueryInterface: ChromeUtils.generateQI([Ci.txIEXSLTRegExFunctions]),
-
-    // txIEXSLTRegExFunctions
-    match: function(str, regex, flags, doc) {
-        var docFrag = doc.createDocumentFragment();
-        var re = new RegExp(regex, flags);
-        var matches = str.match(re);
-        if (matches != null) {
-            for (var i = 0; i < matches.length; ++i) {
-                var match = matches[i];
-                var elem = doc.createElementNS(null, "match");
-                var text = doc.createTextNode(match ? match : '');
-                elem.appendChild(text);
-                docFrag.appendChild(elem);
-            }
-        }
-        return docFrag;
-    },
-
-    replace: function(str, regex, flags, replace) {
-        var re = new RegExp(regex, flags);
-
-        return str.replace(re, replace);
-    },
-
-    test: function(str, regex, flags) {
-        var re = new RegExp(regex, flags);
-
-        return re.test(str);
-    }
-}
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([txEXSLTRegExFunctions]);
diff --git a/dom/xslt/xslt/txEXSLTRegExFunctions.jsm b/dom/xslt/xslt/txEXSLTRegExFunctions.jsm
new file mode 100644
index 000000000000..427f63eb8bc1
--- /dev/null
+++ b/dom/xslt/xslt/txEXSLTRegExFunctions.jsm
@@ -0,0 +1,40 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+function match(str, regex, flags, doc) {
+    var docFrag = doc.createDocumentFragment();
+    var re = new RegExp(regex, flags);
+    var matches = str.match(re);
+    if (matches != null) {
+        for (var i = 0; i < matches.length; ++i) {
+            var match = matches[i];
+            var elem = doc.createElementNS(null, "match");
+            var text = doc.createTextNode(match ? match : '');
+            elem.appendChild(text);
+            docFrag.appendChild(elem);
+        }
+    }
+    return docFrag;
+}
+
+function replace(str, regex, flags, replace) {
+    var re = new RegExp(regex, flags);
+
+    return str.replace(re, replace);
+}
+
+function test(str, regex, flags) {
+    var re = new RegExp(regex, flags);
+
+    return re.test(str);
+}
+
+var EXPORTED_SYMBOLS = [
+  "match",
+  "replace",
+  "test",
+];
diff --git a/dom/xslt/xslt/txEXSLTRegExFunctions.manifest b/dom/xslt/xslt/txEXSLTRegExFunctions.manifest
deleted file mode 100644
index 5d604796ad07..000000000000
--- a/dom/xslt/xslt/txEXSLTRegExFunctions.manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-component {18a03189-067b-4978-b4f1-bafe35292ed6} txEXSLTRegExFunctions.js
-contract @mozilla.org/exslt/regexp;1 {18a03189-067b-4978-b4f1-bafe35292ed6}
diff --git a/mobile/android/installer/package-manifest.in b/mobile/android/installer/package-manifest.in
index 1d5a320efc0b..44ddf4e25e34 100644
--- a/mobile/android/installer/package-manifest.in
+++ b/mobile/android/installer/package-manifest.in
@@ -183,8 +183,6 @@
 @BINPATH@/components/ContentProcessSingleton.js
 @BINPATH@/components/nsURLFormatter.manifest
 @BINPATH@/components/nsURLFormatter.js
-@BINPATH@/components/txEXSLTRegExFunctions.manifest
-@BINPATH@/components/txEXSLTRegExFunctions.js
 @BINPATH@/components/ContentPrefService2.manifest
 @BINPATH@/components/ContentPrefService2.js
 @BINPATH@/components/HandlerService.manifest

From b1d077a87ae8113119cda24d64b1c8f8107afdea Mon Sep 17 00:00:00 2001
From: Kyle Machulis <kyle@nonpolynomial.com>
Date: Thu, 8 Nov 2018 20:46:27 +0000
Subject: [PATCH 33/77] Bug 1505891 - Allow XPIDL CEnums to be infallible;
 r=froydnj

They're just integers, so there's no reason they need to be fallible
since they're basically a built-in anyways.

Differential Revision: https://phabricator.services.mozilla.com/D11363

--HG--
extra : moz-landing-system : lando
---
 xpcom/idl-parser/xpidl/header.py | 2 +-
 xpcom/idl-parser/xpidl/xpidl.py  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/xpcom/idl-parser/xpidl/header.py b/xpcom/idl-parser/xpidl/header.py
index 6009db0e1ab4..18a75b1e5c4e 100644
--- a/xpcom/idl-parser/xpidl/header.py
+++ b/xpcom/idl-parser/xpidl/header.py
@@ -414,7 +414,7 @@ def write_interface(iface, fd):
             realtype = a.realtype.nativeType('in')
             tmpl = attr_builtin_infallible_tmpl
 
-            if a.realtype.kind != 'builtin':
+            if a.realtype.kind != 'builtin' and a.realtype.kind != 'cenum':
                 assert realtype.endswith(' *'), "bad infallible type"
                 tmpl = attr_refcnt_infallible_tmpl
                 realtype = realtype[:-2]  # strip trailing pointer
diff --git a/xpcom/idl-parser/xpidl/xpidl.py b/xpcom/idl-parser/xpidl/xpidl.py
index 764ef974559c..a0a2f910e975 100755
--- a/xpcom/idl-parser/xpidl/xpidl.py
+++ b/xpcom/idl-parser/xpidl/xpidl.py
@@ -1041,9 +1041,10 @@ class Attribute(object):
         if self.infallible and self.realtype.kind not in ['builtin',
                                                           'interface',
                                                           'forward',
-                                                          'webidl']:
+                                                          'webidl',
+                                                          'cenum']:
             raise IDLError('[infallible] only works on interfaces, domobjects, and builtin types '
-                           '(numbers, booleans, and raw char types)',
+                           '(numbers, booleans, cenum, and raw char types)',
                            self.location)
         if self.infallible and not iface.attributes.builtinclass:
             raise IDLError('[infallible] attributes are only allowed on '

From fe1ce98ce4e351e484b469fe61b0705d1416cec2 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Thu, 18 Oct 2018 06:26:38 +0000
Subject: [PATCH 34/77] Bug 1421105 Part 1 - Add a helper
 IsColumnContainerStyle() to StyleColumn. r=dbaron

This helper will also be used in next part.

Differential Revision: https://phabricator.services.mozilla.com/D5208

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsCSSFrameConstructor.cpp | 7 ++-----
 layout/style/nsStyleStruct.h          | 5 +++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 1e5bf644ab2e..3b227d6005ed 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -10902,12 +10902,9 @@ nsCSSFrameConstructor::InitAndWrapInColumnSetFrameIfNeeded(
   ComputedStyle* aComputedStyle)
 {
   MOZ_ASSERT((aBlockFrame->IsBlockFrame() || aBlockFrame->IsDetailsFrame()),
-             "aBlock should either be a block frame or a details frame.");
+             "aBlockFrame should either be a block frame or a details frame.");
 
-  const nsStyleColumn* styleColumn = aComputedStyle->StyleColumn();
-
-  if (styleColumn->mColumnCount == nsStyleColumn::kColumnCountAuto &&
-      styleColumn->mColumnWidth.GetUnit() == eStyleUnit_Auto) {
+  if (!aComputedStyle->StyleColumn()->IsColumnContainerStyle()) {
     aBlockFrame->SetComputedStyleWithoutNotification(aComputedStyle);
     InitAndRestoreFrame(aState, aContent, aParentFrame, aBlockFrame);
     return aBlockFrame;
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 0c1ac7bd0028..e3639f70e8f1 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2756,6 +2756,11 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn
     return (IsVisibleBorderStyle(mColumnRuleStyle) ? mColumnRuleWidth : 0);
   }
 
+  bool IsColumnContainerStyle() const {
+    return (mColumnCount != kColumnCountAuto ||
+            mColumnWidth.GetUnit() != eStyleUnit_Auto);
+  }
+
 protected:
   nscoord mColumnRuleWidth;  // coord
   nscoord mTwipsPerPixel;

From a1e36d1d4618079a63dce0f25b545dcf60786785 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Tue, 30 Oct 2018 05:41:30 +0000
Subject: [PATCH 35/77] Bug 1421105 Part 2 - Implement column-span for block
 and inline frames. r=bzbarsky,dbaron

Other frames calling InitAndWrapInColumnSetFrameIfNeeded() needs to be
modified to support column-span (bug 1489295).

Depends on D5208

Differential Revision: https://phabricator.services.mozilla.com/D5209

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsCSSFrameConstructor.cpp    | 468 ++++++++++++++++++++++-
 layout/base/nsCSSFrameConstructor.h      |  76 ++++
 layout/generic/ColumnSetWrapperFrame.cpp |  36 +-
 layout/generic/ColumnSetWrapperFrame.h   |   8 +
 layout/generic/nsFrameStateBits.h        |  12 +-
 layout/generic/nsIFrame.h                |   8 +
 layout/generic/nsIFrameInlines.h         |   6 +
 layout/style/nsCSSAnonBoxList.h          |  12 +
 layout/style/nsStyleStruct.h             |   4 +
 layout/style/res/ua.css                  |  19 +
 xpcom/ds/StaticAtoms.py                  |   2 +
 11 files changed, 636 insertions(+), 15 deletions(-)

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 3b227d6005ed..8fbe1f1803d7 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -843,6 +843,15 @@ public:
   nsContainerFrame* GetGeometricParent(const nsStyleDisplay& aStyleDisplay,
                                        nsContainerFrame* aContentParentFrame) const;
 
+  // Collect absolute frames in mAbsoluteItems which are proper descendants
+  // of aNewParent, and reparent them to aNewParent.
+  //
+  // Note: This function does something unusual that moves absolute items
+  // after their frames are constructed under a column hierarchy which has
+  // column-span elements. Do not use this if you're not dealing with
+  // columns.
+  void ReparentAbsoluteItems(nsContainerFrame* aNewParent);
+
   /**
    * Function to add a new frame to the right frame list.  This MUST be called
    * on frames before their children have been processed if the frames might
@@ -1158,6 +1167,43 @@ nsFrameConstructorState::GetGeometricParent(const nsStyleDisplay& aStyleDisplay,
   return aContentParentFrame;
 }
 
+void
+nsFrameConstructorState::ReparentAbsoluteItems(nsContainerFrame* aNewParent)
+{
+  // Bug 1491727: This function might not conform to the spec. See
+  // https://github.com/w3c/csswg-drafts/issues/1894.
+
+  MOZ_ASSERT(aNewParent->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR),
+             "Restrict the usage under column hierarchy.");
+
+  nsFrameList newAbsoluteItems;
+
+  nsIFrame* current = mAbsoluteItems.FirstChild();
+  while (current) {
+    nsIFrame* placeholder = current->GetPlaceholderFrame();
+
+    if (nsLayoutUtils::IsProperAncestorFrame(aNewParent, placeholder)) {
+      nsIFrame* next = current->GetNextSibling();
+      mAbsoluteItems.RemoveFrame(current);
+      newAbsoluteItems.AppendFrame(aNewParent, current);
+      current = next;
+    } else {
+      current = current->GetNextSibling();
+    }
+  }
+
+  if (newAbsoluteItems.NotEmpty()) {
+    // ~nsFrameConstructorSaveState() will move newAbsoluteItems to
+    // aNewParent's absolute child list.
+    nsFrameConstructorSaveState absoluteSaveState;
+
+    // It doesn't matter whether aNewParent has position style or not. Caller
+    // won't call us if we can't have absolute children.
+    PushAbsoluteContainingBlock(aNewParent, aNewParent, absoluteSaveState);
+    mAbsoluteItems.SetFrames(newAbsoluteItems);
+  }
+}
+
 nsAbsoluteItems*
 nsFrameConstructorState::GetOutOfFlowFrameItems(nsIFrame* aNewFrame,
                                                 bool aCanBePositioned,
@@ -8497,6 +8543,12 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext*    aPresContext,
     newFrame->AddStateBits(NS_FRAME_OUT_OF_FLOW);
   }
 
+  // A continuation of a frame which has a multi-column ancestor also has
+  // multi-column ancestor.
+  if (aFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
+    newFrame->AddStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR);
+  }
+
   if (nextInFlow) {
     nextInFlow->SetPrevInFlow(newFrame);
     newFrame->SetNextInFlow(nextInFlow);
@@ -10937,20 +10989,106 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
                                       nsIFrame*                aPositionedFrameForAbsPosContainer,
                                       PendingBinding*          aPendingBinding)
 {
-  // Create column wrapper if necessary
+  // If a block frame is in a multi-column subtree, its children may need to
+  // be chopped into runs of blocks containing column-spans and runs of
+  // blocks containing no column-spans. Each run containing column-spans
+  // will be wrapped by an anonymous block. See CreateColumnSpanSiblings() for
+  // the implementation.
+  //
+  // If a block frame is a multi-column container, its children will need to
+  // be processed as above. Moreover, it creates a ColumnSetWrapperFrame as
+  // its outermost frame, and its children which have no
+  // -moz-column-span-wrapper pseudo will be wrapped in ColumnSetFrames. See
+  // FinishBuildingColumns() for the implementation.
+  //
+  // The multi-column subtree maintains the following invariants:
+  //
+  // 1) All the frames have the frame state bit
+  //    NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR set, except for top-level
+  //    ColumnSetWrapperFrame and those children in the column-span subtrees.
+  //
+  // 2) The first and last frame under ColumnSetWrapperFrame are always
+  //    ColumnSetFrame.
+  //
+  // 3) ColumnSetFrames are linked together as continuations.
+  //
+  // 4) Those column-span wrappers are linked together alternately with the
+  //    original block frame and the original block's continuations. That
+  //    is, original block frame -> column-span wrapper -> original block
+  //    frame's continuation -> column-span wrapper -> ...
+  //
+  //    This is very similar to what we do with block-inside-inline
+  //    splitting, except here we can use continuations rather than the
+  //    IBSibling linkage since the frames are the same type.
+  //
+  // For example, this HTML
+  //  <div id="x" style="column-count: 2;">
+  //    <div style="column-span: all">a</div>
+  //    <div id="y">
+  //      b
+  //      <div style="column-span: all">c</div>
+  //      <div style="column-span: all">d</div>
+  //      e
+  //    </div>
+  //  </div>
+  //  <div style="column-span: all">f</div>
+  //
+  //  yields the following frame tree.
+  //
+  // A) ColumnSetWrapper (original style)
+  // B)   ColumnSet (-moz-column-set)   <-- always created by BeginBuildingColumns
+  // C)     Block (-moz-column-content)
+  // D)   Block (-moz-column-span-wrapper, created by x)
+  // E)     Block (div)
+  // F)       Text ("a")
+  // G)   ColumnSet (-moz-column-set)
+  // H)     Block (-moz-column-content, created by x)
+  // I)       Block (div, y)
+  // J)         Text ("b")
+  // K)   Block (-moz-column-span-wrapper, created by x)
+  // L)     Block (-moz-column-span-wrapper, created by y)
+  // M)       Block (div, new BFC)
+  // N)         Text ("c")
+  // O)       Block (div, new BFC)
+  // P)         Text ("d")
+  // Q)   ColumnSet (-moz-column-set)
+  // R)     Block (-moz-column-content, created by x)
+  // S)       Block (div, y)
+  // T)         Text ("e")
+  // U) Block (div, new BFC)   <-- not in multi-column hierarchy
+  // V)   Text ("f")
+  //
+  // ColumnSet linkage described in 3): B -> G -> Q
+  //
+  // Column-span linkage described in 4): C -> D -> H -> K -> R  and  I -> L -> S
+  //
+
   nsBlockFrame* blockFrame = do_QueryFrame(*aNewFrame);
   MOZ_ASSERT(blockFrame->IsBlockFrame() || blockFrame->IsDetailsFrame(),
              "not a block frame nor a details frame?");
 
-  *aNewFrame =
-    InitAndWrapInColumnSetFrameIfNeeded(aState, aContent, aParentFrame,
-                                        blockFrame, aComputedStyle);
+  // Create column hierarchy if necessary.
+  const bool needsColumn =
+    aComputedStyle->StyleColumn()->IsColumnContainerStyle();
+  if (needsColumn) {
+    *aNewFrame =
+      BeginBuildingColumns(aState, aContent, aParentFrame, blockFrame, aComputedStyle);
 
-  if (blockFrame != *aNewFrame) {
-    // blockFrame is wrapped in nsColumnSetFrame.
     if (aPositionedFrameForAbsPosContainer == blockFrame) {
       aPositionedFrameForAbsPosContainer = *aNewFrame;
     }
+  } else {
+    // No need to create column hierarchy. Initialize block frame.
+    blockFrame->SetComputedStyleWithoutNotification(aComputedStyle);
+    InitAndRestoreFrame(aState, aContent, aParentFrame, blockFrame);
+
+    if (StaticPrefs::layout_css_column_span_enabled()) {
+      if (blockFrame->IsColumnSpan()) {
+        // Per spec, a column-span always establishes a new block formatting
+        // context.
+        blockFrame->AddStateBits(NS_BLOCK_FORMATTING_CONTEXT_STATE_BITS);
+      }
+    }
   }
 
   aState.AddChild(*aNewFrame, aFrameItems, aContent,
@@ -10976,14 +11114,69 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
     aState.PushAbsoluteContainingBlock(*aNewFrame, aPositionedFrameForAbsPosContainer, absoluteSaveState);
   }
 
+  // Ensure all the children in the multi-column subtree are tagged with
+  // NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR, except for those children in the
+  // column-span subtree. InitAndRestoreFrame() will add
+  // mAdditionalStateBits for us.
+  AutoRestore<nsFrameState> savedStateBits(aState.mAdditionalStateBits);
+  if (StaticPrefs::layout_css_column_span_enabled()) {
+    if (needsColumn) {
+      aState.mAdditionalStateBits |= NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR;
+    } else if (blockFrame->IsColumnSpan()) {
+      aState.mAdditionalStateBits &= ~NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR;
+    }
+  }
+
   // Process the child content
   nsFrameItems childItems;
   ProcessChildren(aState, aContent, aComputedStyle, blockFrame, true,
                   childItems, true, aPendingBinding);
 
-  // Set the frame's initial child list
-  blockFrame->SetInitialChildList(kPrincipalList, childItems);
-  CreateBulletFrameForListItemIfNeeded(blockFrame);
+  if (!StaticPrefs::layout_css_column_span_enabled()) {
+    // Set the frame's initial child list
+    blockFrame->SetInitialChildList(kPrincipalList, childItems);
+    CreateBulletFrameForListItemIfNeeded(blockFrame);
+    return;
+  }
+
+  if (!MayNeedToCreateColumnSpanSiblings(blockFrame, childItems)) {
+    // No need to create column-span siblings.
+    blockFrame->SetInitialChildList(kPrincipalList, childItems);
+    return;
+  }
+
+  // Extract any initial non-column-span kids, and put them in block frame's
+  // child list.
+  nsFrameList initialNonColumnSpanKids =
+    childItems.Split([](nsIFrame* f) { return f->IsColumnSpan(); });
+  blockFrame->SetInitialChildList(kPrincipalList, initialNonColumnSpanKids);
+  if (childItems.IsEmpty()) {
+    // No more column-span kids need to be processed.
+    return;
+  }
+
+  nsFrameList columnSpanSiblings =
+    CreateColumnSpanSiblings(aState, blockFrame, childItems,
+                             aPositionedFrameForAbsPosContainer);
+
+  if (needsColumn) {
+    // We're constructing a column container; need to finish building it.
+    FinishBuildingColumns(aState, *aNewFrame, blockFrame, columnSpanSiblings);
+  } else {
+    // We're constructing a normal block which has column-span children in a
+    // column hierarchy such as "x" in the following example.
+    //
+    // <div style="column-count: 2">
+    //   <div id="x">
+    //     <div>normal child</div>
+    //     <div style="column-span">spanner</div>
+    //   </div>
+    // </div>
+    aFrameItems.AppendFrames(nullptr, columnSpanSiblings);
+  }
+
+  MOZ_ASSERT(columnSpanSiblings.IsEmpty(),
+             "The column-span siblings should be moved to the proper place!");
 }
 
 void
@@ -11015,6 +11208,218 @@ nsCSSFrameConstructor::CreateBulletFrameForListItemIfNeeded(
   }
 }
 
+nsContainerFrame*
+nsCSSFrameConstructor::BeginBuildingColumns(
+  nsFrameConstructorState& aState,
+  nsIContent* aContent,
+  nsContainerFrame* aParentFrame,
+  nsContainerFrame* aColumnContent,
+  ComputedStyle* aComputedStyle)
+{
+  MOZ_ASSERT(aColumnContent->IsBlockFrame() || aColumnContent->IsDetailsFrame(),
+             "aColumnContent should either be a block frame or a details frame.");
+  MOZ_ASSERT(aComputedStyle->StyleColumn()->IsColumnContainerStyle(),
+             "No need to build a column hierarchy!");
+
+  if (!StaticPrefs::layout_css_column_span_enabled()) {
+    // Preserve the old behavior which supports no column-span.
+    // Wrap the block frame in a ColumnSetFrame.
+    nsContainerFrame* columnSetFrame =
+      NS_NewColumnSetFrame(mPresShell, aComputedStyle,
+                           nsFrameState(NS_FRAME_OWNS_ANON_BOXES));
+    InitAndRestoreFrame(aState, aContent, aParentFrame, columnSetFrame);
+    SetInitialSingleChild(columnSetFrame, aColumnContent);
+
+    RefPtr<ComputedStyle> anonBlockStyle = mPresShell->StyleSet()->
+      ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::columnContent(),
+                                         aComputedStyle);
+    aColumnContent->SetComputedStyleWithoutNotification(anonBlockStyle);
+    InitAndRestoreFrame(aState, aContent, columnSetFrame, aColumnContent);
+
+    return columnSetFrame;
+  }
+
+  // The initial column hierarchy looks like this:
+  //
+  // ColumnSetWrapper (original style)
+  //   ColumnSet (-moz-column-set)
+  //     Block (-moz-column-content)
+  //
+  nsBlockFrame* columnSetWrapper =
+    NS_NewColumnSetWrapperFrame(mPresShell, aComputedStyle,
+                                nsFrameState(NS_FRAME_OWNS_ANON_BOXES));
+  InitAndRestoreFrame(aState, aContent, aParentFrame, columnSetWrapper);
+
+  RefPtr<ComputedStyle> columnSetStyle = mPresShell->StyleSet()->
+    ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::columnSet(),
+                                       aComputedStyle);
+  nsContainerFrame* columnSet =
+    NS_NewColumnSetFrame(mPresShell, columnSetStyle,
+                         nsFrameState(NS_FRAME_OWNS_ANON_BOXES));
+  InitAndRestoreFrame(aState, aContent, columnSetWrapper, columnSet);
+  columnSet->AddStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR);
+
+  RefPtr<ComputedStyle> blockStyle = mPresShell->StyleSet()->
+    ResolveInheritingAnonymousBoxStyle(nsCSSAnonBoxes::columnContent(),
+                                       columnSetStyle);
+  aColumnContent->SetComputedStyleWithoutNotification(blockStyle);
+  InitAndRestoreFrame(aState, aContent, columnSet, aColumnContent);
+  aColumnContent->AddStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR);
+
+  // Set up the parent-child chain.
+  SetInitialSingleChild(columnSetWrapper, columnSet);
+  SetInitialSingleChild(columnSet, aColumnContent);
+
+  return columnSetWrapper;
+}
+
+void
+nsCSSFrameConstructor::FinishBuildingColumns(
+  nsFrameConstructorState& aState,
+  nsContainerFrame* aColumnSetWrapper,
+  nsContainerFrame* aColumnContent,
+  nsFrameList& aColumnContentSiblings)
+{
+  MOZ_ASSERT(StaticPrefs::layout_css_column_span_enabled(),
+             "Call this only when layout.css.column-span.enabled is true!");
+
+  nsContainerFrame* prevColumnSet = aColumnContent->GetParent();
+
+  MOZ_ASSERT(prevColumnSet->IsColumnSetFrame() &&
+             prevColumnSet->GetParent() == aColumnSetWrapper,
+             "Should have established column hierarchy!");
+
+  nsFrameItems finalItems;
+  while (aColumnContentSiblings.NotEmpty()) {
+    nsIFrame* f = aColumnContentSiblings.RemoveFirstChild();
+    if (f->IsColumnSpan()) {
+      // Do nothing for column-span wrappers. Just move it to the final
+      // items.
+      finalItems.AddChild(f);
+    } else {
+      auto* continuingColumnSet = static_cast<nsContainerFrame*>(
+        CreateContinuingFrame(mPresShell->GetPresContext(),
+                              prevColumnSet,
+                              aColumnSetWrapper,
+                              false));
+      f->SetParent(continuingColumnSet);
+      SetInitialSingleChild(continuingColumnSet, f);
+      finalItems.AddChild(continuingColumnSet);
+      prevColumnSet = continuingColumnSet;
+    }
+  }
+
+  finalItems.ApplySetParent(aColumnSetWrapper);
+  aColumnSetWrapper->AppendFrames(kPrincipalList, finalItems);
+}
+
+bool
+nsCSSFrameConstructor::MayNeedToCreateColumnSpanSiblings(
+  nsContainerFrame* aBlockFrame,
+  const nsFrameList& aChildList)
+{
+  MOZ_ASSERT(StaticPrefs::layout_css_column_span_enabled(),
+             "Call this only when layout.css.column-span.enabled is true!");
+
+  if (aBlockFrame->IsColumnSpan() ||
+      !aBlockFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
+    // The children of a column-span never need to be further processed even
+    // if there is a nested column-span child. Because a column-span always
+    // creates its own block formatting context, a nested column-span child
+    // won't be in the same block formatting context with the nearest
+    // multi-column ancestor. This is the same case as if the column-span is
+    // outside of a multi-column hierarchy.
+    return false;
+  }
+
+  if (aChildList.IsEmpty()) {
+    // No child needs to be processed.
+    return false;
+  }
+
+  if (aBlockFrame->IsDetailsFrame()) {
+    // Not dealing with details frame for now.
+    return false;
+  }
+
+  if (aBlockFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW)) {
+    // No need to deal with an out-of-flow frame because column-span applies
+    // only to in-flow elements per spec.
+    return false;
+  }
+
+  // Need to actually look into the child items.
+  return true;
+}
+
+nsFrameItems
+nsCSSFrameConstructor::CreateColumnSpanSiblings(nsFrameConstructorState& aState,
+                                                nsContainerFrame* aInitialBlock,
+                                                nsFrameList& aChildList,
+                                                nsIFrame* aPositionedFrame)
+{
+  MOZ_ASSERT(!aPositionedFrame || aPositionedFrame->IsAbsPosContainingBlock());
+
+  nsIContent* const content = aInitialBlock->GetContent();
+  ComputedStyle* const initialBlockStyle = aInitialBlock->Style();
+  nsContainerFrame* const parentFrame = aInitialBlock->GetParent();
+
+  nsFrameItems siblings;
+  nsContainerFrame* lastNewBlock = aInitialBlock;
+  do {
+    MOZ_ASSERT(aChildList.NotEmpty(), "Why call this if child list is empty?");
+    MOZ_ASSERT(aChildList.FirstChild()->IsColumnSpan(),
+               "Must have the child starting with column-span!");
+
+    // Grab the consecutive column-span kids, and reparent them into a
+    // block frame.
+    RefPtr<ComputedStyle> columnSpanWrapperStyle = mPresShell->StyleSet()->
+      ResolveNonInheritingAnonymousBoxStyle(nsCSSAnonBoxes::columnSpanWrapper());
+    nsBlockFrame* columnSpanWrapper =
+      NS_NewBlockFrame(mPresShell, columnSpanWrapperStyle);
+    InitAndRestoreFrame(aState, content, parentFrame, columnSpanWrapper, false);
+    columnSpanWrapper->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
+
+    nsFrameList columnSpanKids =
+      aChildList.Split([](nsIFrame* f) { return !f->IsColumnSpan(); });
+    columnSpanKids.ApplySetParent(columnSpanWrapper);
+    columnSpanWrapper->SetInitialChildList(kPrincipalList, columnSpanKids);
+    if (aPositionedFrame) {
+      aState.ReparentAbsoluteItems(columnSpanWrapper);
+    }
+
+    lastNewBlock->SetNextContinuation(columnSpanWrapper);
+    columnSpanWrapper->SetPrevContinuation(lastNewBlock);
+    siblings.AddChild(columnSpanWrapper);
+
+    // Grab the consecutive non-column-span kids, and reparent them into a
+    // block frame.
+    nsBlockFrame* nonColumnSpanWrapper =
+      NS_NewBlockFrame(mPresShell, initialBlockStyle);
+    InitAndRestoreFrame(aState, content, parentFrame, nonColumnSpanWrapper, false);
+    nonColumnSpanWrapper->AddStateBits(NS_FRAME_CAN_HAVE_ABSPOS_CHILDREN);
+
+    if (aChildList.NotEmpty()) {
+      nsFrameList nonColumnSpanKids =
+        aChildList.Split([](nsIFrame* f) { return f->IsColumnSpan(); });
+
+      nonColumnSpanKids.ApplySetParent(nonColumnSpanWrapper);
+      nonColumnSpanWrapper->SetInitialChildList(kPrincipalList, nonColumnSpanKids);
+      if (aPositionedFrame) {
+        aState.ReparentAbsoluteItems(nonColumnSpanWrapper);
+      }
+    }
+
+    columnSpanWrapper->SetNextContinuation(nonColumnSpanWrapper);
+    nonColumnSpanWrapper->SetPrevContinuation(columnSpanWrapper);
+    siblings.AddChild(nonColumnSpanWrapper);
+
+    lastNewBlock = nonColumnSpanWrapper;
+  } while (aChildList.NotEmpty());
+
+  return siblings;
+}
+
 nsIFrame*
 nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
                                        FrameConstructionItem&   aItem,
@@ -11027,6 +11432,11 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   // contain the runs of blocks, inline frames with our style for the runs of
   // inlines, and put all these frames, in order, into aFrameItems.
   //
+  // When there are column-span blocks in a run of blocks, instead of
+  // creating an anonymous block to wrap them, we create multiple anonymous
+  // blocks that are continuations of each other, wrapping runs of
+  // non-column-spans and runs of column-spans.
+  //
   // We return the the first one.  The whole setup is called an {ib}
   // split; in what follows "frames in the split" refers to the anonymous blocks
   // and inlines that contain our children.
@@ -11034,14 +11444,23 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   // {ib} splits maintain the following invariants:
   // 1) All frames in the split have the NS_FRAME_PART_OF_IBSPLIT bit
   //    set.
+  //
   // 2) Each frame in the split has the nsIFrame::IBSplitSibling
   //    property pointing to the next frame in the split, except for the last
   //    one, which does not have it set.
+  //
   // 3) Each frame in the split has the nsIFrame::IBSplitPrevSibling
   //    property pointing to the previous frame in the split, except for the
   //    first one, which does not have it set.
+  //
   // 4) The first and last frame in the split are always inlines.
   //
+  // 5) The frames wrapping runs of non-column-spans and runs of
+  //    column-spans are linked together by continuations.
+  //
+  // 6) The first and last frame in the chains of blocks are always wrapping
+  //    non-column-spans. Both of them are created even if they're empty.
+  //
   // An invariant that is NOT maintained is that the wrappers are actually
   // linked via GetNextSibling linkage.  A simple example is an inline
   // containing an inline that contains a block.  The three parts of the inner
@@ -11183,10 +11602,35 @@ nsCSSFrameConstructor::CreateIBSiblings(nsFrameConstructorState& aState,
     // and the start of our next inline's kids
     nsFrameList blockKids =
       aChildItems.Split([](nsIFrame* f) { return f->IsInlineOutside(); });
-    MoveChildrenTo(aInitialInline, blockFrame, blockKids);
 
-    SetFrameIsIBSplit(lastNewInline, blockFrame);
-    aSiblings.AddChild(blockFrame);
+    if (!StaticPrefs::layout_css_column_span_enabled() ||
+        !aInitialInline->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
+      MoveChildrenTo(aInitialInline, blockFrame, blockKids);
+
+      SetFrameIsIBSplit(lastNewInline, blockFrame);
+      aSiblings.AddChild(blockFrame);
+    } else {
+      // Extract any initial non-column-span frames, and put them in
+      // blockFrame's child list.
+      nsFrameList initialNonColumnSpanKids =
+        blockKids.Split([](nsIFrame* f) { return f->IsColumnSpan(); });
+      MoveChildrenTo(aInitialInline, blockFrame, initialNonColumnSpanKids);
+
+      SetFrameIsIBSplit(lastNewInline, blockFrame);
+      aSiblings.AddChild(blockFrame);
+
+      if (blockKids.NotEmpty()) {
+        // Add NS_FRAME_PART_OF_IBSPLIT bit to all the wrapper frames
+        // created by CreateColumnSpanSiblings.
+        AutoRestore<nsFrameState> savedStateBits(aState.mAdditionalStateBits);
+        aState.mAdditionalStateBits |= NS_FRAME_PART_OF_IBSPLIT;
+
+        nsFrameItems columnSpanSiblings =
+          CreateColumnSpanSiblings(aState, blockFrame, blockKids,
+                                   aIsAbsPosCB ? aInitialInline : nullptr);
+        aSiblings.AppendFrames(nullptr, columnSpanSiblings);
+      }
+    }
 
     // Now grab the initial inlines in aChildItems and put them into an inline
     // frame.
diff --git a/layout/base/nsCSSFrameConstructor.h b/layout/base/nsCSSFrameConstructor.h
index 5a393259e5a7..e79537aa082d 100644
--- a/layout/base/nsCSSFrameConstructor.h
+++ b/layout/base/nsCSSFrameConstructor.h
@@ -1842,6 +1842,9 @@ private:
   // initializes aBlockFrame.
   //
   // @return the new ColumnSetFrame if needed; otherwise aBlockFrame.
+  //
+  // FIXME (Bug 1489295): Callers using this function to create multi-column
+  // hierarchy should be revised to support column-span.
   nsContainerFrame* InitAndWrapInColumnSetFrameIfNeeded(
     nsFrameConstructorState& aState,
     nsIContent* aContent,
@@ -1877,6 +1880,79 @@ private:
 
   void CreateBulletFrameForListItemIfNeeded(nsBlockFrame* aBlockFrame);
 
+  // Build the initial column hierarchy around aColumnContent. This function
+  // should be called before constructing aColumnContent's children.
+  //
+  // Before calling FinishBuildingColumns(), we need to create column-span
+  // siblings for aColumnContent's children. Caller can use helpers
+  // MayNeedToCreateColumnSpanSiblings() and CreateColumnSpanSiblings() to
+  // check whether column-span siblings might need to be created and to do
+  // the actual work of creating them if they're needed.
+  //
+  // @param aColumnContent the block that we're wrapping in a ColumnSet. On
+  //        entry to this function it has aComputedStyle as its style. After
+  //        this function returns, aColumnContent has a ::-moz-column-content
+  //        anonymous box style.
+  // @param aParentFrame the parent frame we want to use for the
+  //        ColumnSetWrapperFrame (which would have been the parent of
+  //        aColumnContent if we were not creating a column hierarchy).
+  // @param aContent is the content of the aColumnContent.
+  // @return the outermost ColumnSetWrapperFrame (or ColumnSetFrame if
+  //         "column-span" is disabled).
+  //
+  // Bug 1499281: We can change the return type to ColumnSetWrapperFrame
+  // once "layout.css.column-span.enabled" is removed.
+  nsContainerFrame* BeginBuildingColumns(nsFrameConstructorState& aState,
+                                         nsIContent* aContent,
+                                         nsContainerFrame* aParentFrame,
+                                         nsContainerFrame* aColumnContent,
+                                         ComputedStyle* aComputedStyle);
+
+  // Complete building the column hierarchy by first wrapping each
+  // non-column-span child in aChildList in a ColumnSetFrame (skipping
+  // column-span children), and reparenting them to have aColumnSetWrapper
+  // as their parent.
+  //
+  // @param aColumnSetWrapper is the frame returned by
+  //        BeginBuildingColumns(), and is the grandparent of aColumnContent.
+  // @param aColumnContent is the block frame passed into
+  //        BeginBuildingColumns()
+  // @param aColumnContentSiblings contains the aColumnContent's siblings, which
+  //        are the column spanners and aColumnContent's continuations returned
+  //        by CreateColumnSpanSiblings(). It'll become empty after this call.
+  //
+  // Note: No need to call this function if "column-span" is disabled.
+  void FinishBuildingColumns(nsFrameConstructorState& aState,
+                             nsContainerFrame* aColumnSetWrapper,
+                             nsContainerFrame* aColumnContent,
+                             nsFrameList& aColumnContentSiblings);
+
+  // Return whether aBlockFrame's children in aChildList, which might
+  // contain column-span, may need to be wrapped in
+  // ::moz-column-span-wrapper and promoted as aBlockFrame's siblings.
+  //
+  // @param aBlockFrame is the parent of the frames in aChildList.
+  //
+  // Note: This a check without actually looking into each frame in the
+  // child list, so it may return false positive.
+  bool MayNeedToCreateColumnSpanSiblings(nsContainerFrame* aBlockFrame,
+                                         const nsFrameList& aChildList);
+
+  // Wrap consecutive runs of column-span kids and runs of non-column-span
+  // kids in blocks for aInitialBlock's children.
+  //
+  // @param aInitialBlock is the parent of those frames in aChildList.
+  // @param aChildList must begin with a column-span kid. It becomes empty
+  //        after this call.
+  // @param aPositionedFrame if non-null, it's the frame whose style is making
+  //        aInitialBlock an abs-pos container.
+  //
+  // Return those wrapping blocks in nsFrameItems.
+  nsFrameItems CreateColumnSpanSiblings(nsFrameConstructorState& aState,
+                                        nsContainerFrame* aInitialBlock,
+                                        nsFrameList& aChildList,
+                                        nsIFrame* aPositionedFrame);
+
   nsIFrame* ConstructInline(nsFrameConstructorState& aState,
                             FrameConstructionItem&   aItem,
                             nsContainerFrame*        aParentFrame,
diff --git a/layout/generic/ColumnSetWrapperFrame.cpp b/layout/generic/ColumnSetWrapperFrame.cpp
index 8e10b825915b..5f241b71a906 100644
--- a/layout/generic/ColumnSetWrapperFrame.cpp
+++ b/layout/generic/ColumnSetWrapperFrame.cpp
@@ -33,6 +33,36 @@ ColumnSetWrapperFrame::ColumnSetWrapperFrame(ComputedStyle* aStyle)
 {
 }
 
+void
+ColumnSetWrapperFrame::AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult)
+{
+  MOZ_ASSERT(!GetPrevContinuation(),
+             "Who set NS_FRAME_OWNS_ANON_BOXES on our continuations?");
+
+  // It's sufficient to append the first ColumnSet child, which is the first
+  // continuation of the directly owned anon boxes.
+  nsIFrame* columnSet = PrincipalChildList().FirstChild();
+  MOZ_ASSERT(columnSet && columnSet->IsColumnSetFrame(),
+             "The first child should always be ColumnSet!");
+  aResult.AppendElement(OwnedAnonBox(columnSet));
+
+#ifdef DEBUG
+  // All the other ColumnSets are the continuation of the first ColumnSet;
+  // the -moz-column-span-wrappers are the continuations of other blocks in
+  // -moz-column-span-contents.
+  for (nsIFrame* child : PrincipalChildList()) {
+    if (child == columnSet) {
+      // Skip testing the first child.
+      continue;
+    }
+    MOZ_ASSERT((child->IsColumnSetFrame() ||
+                child->Style()->GetPseudo() == nsCSSAnonBoxes::columnSpanWrapper()) &&
+               child->GetPrevContinuation(),
+               "Prev continuation is not set properly?");
+  }
+#endif
+}
+
 #ifdef DEBUG_FRAME_DUMP
 nsresult
 ColumnSetWrapperFrame::GetFrameName(nsAString& aResult) const
@@ -48,7 +78,11 @@ void
 ColumnSetWrapperFrame::AppendFrames(ChildListID aListID,
                                     nsFrameList& aFrameList)
 {
-  MOZ_ASSERT_UNREACHABLE("Unsupported operation!");
+#ifdef DEBUG
+  MOZ_ASSERT(!mFinishedBuildingColumns, "Should only call once!");
+  mFinishedBuildingColumns = true;
+#endif
+
   nsBlockFrame::AppendFrames(aListID, aFrameList);
 }
 
diff --git a/layout/generic/ColumnSetWrapperFrame.h b/layout/generic/ColumnSetWrapperFrame.h
index cd909df67244..0660a7294ab4 100644
--- a/layout/generic/ColumnSetWrapperFrame.h
+++ b/layout/generic/ColumnSetWrapperFrame.h
@@ -33,6 +33,8 @@ public:
                                                      ComputedStyle* aStyle,
                                                      nsFrameState aStateFlags);
 
+  void AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult) override;
+
 #ifdef DEBUG_FRAME_DUMP
   nsresult GetFrameName(nsAString& aResult) const override;
 #endif
@@ -48,6 +50,12 @@ public:
 private:
   explicit ColumnSetWrapperFrame(ComputedStyle* aStyle);
   ~ColumnSetWrapperFrame() override = default;
+
+#ifdef DEBUG
+  // True if frame constructor has finished building this frame and all of
+  // its descendants.
+  bool mFinishedBuildingColumns = false;
+#endif
 };
 
 } // namespace mozilla
diff --git a/layout/generic/nsFrameStateBits.h b/layout/generic/nsFrameStateBits.h
index ba8f455d9cde..bfc25ebb16ac 100644
--- a/layout/generic/nsFrameStateBits.h
+++ b/layout/generic/nsFrameStateBits.h
@@ -224,7 +224,15 @@ FRAME_STATE_BIT(Generic, 42, NS_FRAME_FONT_INFLATION_FLOW_ROOT)
 // this does not include nsSVGOuterSVGFrame since it takes part is CSS layout.
 FRAME_STATE_BIT(Generic, 43, NS_FRAME_SVG_LAYOUT)
 
-// Bits 44 and 45 are currently unused, but be kind and check with bug 1465474
+// This bit is set if a frame has a multi-column ancestor (i.e.
+// ColumnSetWrapperFrame) within the same block formatting context. A
+// top-level ColumnSetWrapperFrame doesn't have this bit set, whereas a
+// ColumnSetWrapperFrame nested inside a column does have this bit set. All
+// the children of the column-spans do not have this bit set because they
+// are in a new block formatting context created by column-spans.
+FRAME_STATE_BIT(Generic, 44, NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)
+
+// Bits 45 is currently unused, but be kind and check with bug 1465474
 // first please :-)
 
 // This bit indicates that we're tracking visibility for this frame, and that
@@ -285,7 +293,7 @@ FRAME_STATE_BIT(Generic, 59, NS_FRAME_IS_IN_SINGLE_CHAR_MI)
 // NOTE: Bits 20-31 and 60-63 of the frame state are reserved for specific
 // frame classes.
 
-// NOTE: Bits 44 and 45 are currently unused.
+// NOTE: Currently unused and available bit(s): 45.
 
 
 // == Frame state bits that apply to box frames ===============================
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 2bfe88272378..389f7a090f42 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -3885,6 +3885,14 @@ public:
   inline bool IsRelativelyPositioned() const;
   inline bool IsAbsolutelyPositioned(const nsStyleDisplay* aStyleDisplay = nullptr) const;
 
+  // Does this frame have "column-span: all" style.
+  //
+  // Note this only checks computed style, but not testing whether the
+  // containing block formatting context was established by a multicol.
+  // Callers need to consider NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR to check
+  // whether multi-column effects apply or not.
+  inline bool IsColumnSpan() const;
+
   /**
    * Returns the vertical-align value to be used for layout, if it is one
    * of the enumerated values.  If this is an SVG text frame, it returns a value
diff --git a/layout/generic/nsIFrameInlines.h b/layout/generic/nsIFrameInlines.h
index 566e04b20173..141e121d9406 100644
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -91,6 +91,12 @@ nsIFrame::IsInlineOutside() const
   return StyleDisplay()->IsInlineOutside(this);
 }
 
+bool
+nsIFrame::IsColumnSpan() const
+{
+  return IsBlockOutside() && StyleColumn()->IsColumnSpanStyle();
+}
+
 mozilla::StyleDisplay
 nsIFrame::GetDisplay() const
 {
diff --git a/layout/style/nsCSSAnonBoxList.h b/layout/style/nsCSSAnonBoxList.h
index 4c76e2c02427..5593cddc3beb 100644
--- a/layout/style/nsCSSAnonBoxList.h
+++ b/layout/style/nsCSSAnonBoxList.h
@@ -72,6 +72,11 @@ CSS_NON_INHERITING_ANON_BOX(tableCol, ":-moz-table-column")
 
 CSS_NON_INHERITING_ANON_BOX(pageBreak, ":-moz-pagebreak")
 
+// Applies to blocks that wrap contiguous runs of "column-span: all"
+// elements in multi-column subtrees, or the wrappers themselves, all the
+// way up to the column set wrappers.
+CSS_NON_INHERITING_ANON_BOX(columnSpanWrapper, ":-moz-column-span-wrapper")
+
 //---------------------------------------------------------------------------
 // Other ones
 //---------------------------------------------------------------------------
@@ -109,7 +114,14 @@ CSS_ANON_BOX(pageSequence, ":-moz-page-sequence")
 CSS_ANON_BOX(scrolledContent, ":-moz-scrolled-content")
 CSS_ANON_BOX(scrolledCanvas, ":-moz-scrolled-canvas")
 CSS_ANON_BOX(scrolledPageSequence, ":-moz-scrolled-page-sequence")
+
+// A column set is a set of columns inside of ColumnSetWrapperFrame, which
+// applies to nsColumnSetFrame. It doesn't contain any column-span elements.
+CSS_ANON_BOX(columnSet, ":-moz-column-set")
+
+// Applies to each column block inside of a column set.
 CSS_ANON_BOX(columnContent, ":-moz-column-content")
+
 CSS_ANON_BOX(viewport, ":-moz-viewport")
 CSS_ANON_BOX(viewportScroll, ":-moz-viewport-scroll")
 
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index e3639f70e8f1..9930ba6312c1 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -2761,6 +2761,10 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleColumn
             mColumnWidth.GetUnit() != eStyleUnit_Auto);
   }
 
+  bool IsColumnSpanStyle() const {
+    return mColumnSpan == mozilla::StyleColumnSpan::All;
+  }
+
 protected:
   nscoord mColumnRuleWidth;  // coord
   nscoord mTwipsPerPixel;
diff --git a/layout/style/res/ua.css b/layout/style/res/ua.css
index c9dfc08c63e8..f03e0237f59c 100644
--- a/layout/style/res/ua.css
+++ b/layout/style/res/ua.css
@@ -245,6 +245,7 @@
 %endif
 }
 
+*|*::-moz-column-set,
 *|*::-moz-column-content {
   /* the column boxes inside a column-flowed block */
   /* make unicode-bidi inherit, otherwise it has no effect on column boxes */
@@ -257,6 +258,24 @@
   height: 100%;
 }
 
+*|*::-moz-column-set {
+  /* Inherit from ColumnSetWrapperFrame so that nsColumnSetFrame is aware of
+   them.*/
+  columns: inherit;
+  column-gap: inherit;
+  column-rule: inherit;
+  column-fill: inherit;
+}
+
+*|*::-moz-column-span-wrapper {
+  /* As a result of the discussion in
+   * https://github.com/w3c/csswg-drafts/issues/1072, most of the styles
+   * currently applied to ::-moz-block-inside-inline-wrapper should not
+   * apply here. */
+  display: block;
+  column-span: all;
+}
+
 *|*::-moz-anonymous-flex-item,
 *|*::-moz-anonymous-grid-item {
   /* Anonymous blocks that wrap contiguous runs of text
diff --git a/xpcom/ds/StaticAtoms.py b/xpcom/ds/StaticAtoms.py
index 22bb52b28841..89bdabf38d37 100644
--- a/xpcom/ds/StaticAtoms.py
+++ b/xpcom/ds/StaticAtoms.py
@@ -2276,6 +2276,7 @@ STATIC_ATOMS = [
     NonInheritingAnonBoxAtom("AnonBox_tableColGroup", ":-moz-table-column-group"),
     NonInheritingAnonBoxAtom("AnonBox_tableCol", ":-moz-table-column"),
     NonInheritingAnonBoxAtom("AnonBox_pageBreak", ":-moz-pagebreak"),
+    NonInheritingAnonBoxAtom("AnonBox_columnSpanWrapper", ":-moz-column-span-wrapper"),
     InheritingAnonBoxAtom("AnonBox_mozText", ":-moz-text"),
     InheritingAnonBoxAtom("AnonBox_firstLetterContinuation", ":-moz-first-letter-continuation"),
     InheritingAnonBoxAtom("AnonBox_mozBlockInsideInlineWrapper", ":-moz-block-inside-inline-wrapper"),
@@ -2301,6 +2302,7 @@ STATIC_ATOMS = [
     InheritingAnonBoxAtom("AnonBox_scrolledContent", ":-moz-scrolled-content"),
     InheritingAnonBoxAtom("AnonBox_scrolledCanvas", ":-moz-scrolled-canvas"),
     InheritingAnonBoxAtom("AnonBox_scrolledPageSequence", ":-moz-scrolled-page-sequence"),
+    InheritingAnonBoxAtom("AnonBox_columnSet", ":-moz-column-set"),
     InheritingAnonBoxAtom("AnonBox_columnContent", ":-moz-column-content"),
     InheritingAnonBoxAtom("AnonBox_viewport", ":-moz-viewport"),
     InheritingAnonBoxAtom("AnonBox_viewportScroll", ":-moz-viewport-scroll"),

From cce6ef31c96b5d2b6117de69badcb93cba1b6388 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Wed, 24 Oct 2018 22:19:19 +0000
Subject: [PATCH 36/77] Bug 1421105 Part 3 - Support dynamically adding or
 removing elements under multi-column subtree. r=bzbarsky,dbaron

Depends on D5209

Differential Revision: https://phabricator.services.mozilla.com/D5210

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsCSSFrameConstructor.cpp         | 102 +++++++++++++++++-
 layout/generic/ColumnSetWrapperFrame.cpp      |  18 ++++
 layout/generic/ColumnSetWrapperFrame.h        |   2 +
 ...multicol-span-all-dynamic-add-001-ref.html |  28 +++++
 .../multicol-span-all-dynamic-add-001.html    |  46 ++++++++
 ...multicol-span-all-dynamic-add-002-ref.html |  28 +++++
 .../multicol-span-all-dynamic-add-002.html    |  46 ++++++++
 ...multicol-span-all-dynamic-add-003-ref.html |  27 +++++
 .../multicol-span-all-dynamic-add-003.html    |  46 ++++++++
 ...multicol-span-all-dynamic-add-004-ref.html |  37 +++++++
 .../multicol-span-all-dynamic-add-004.html    |  55 ++++++++++
 .../multicol-span-all-dynamic-add-005.html    |  48 +++++++++
 .../multicol-span-all-dynamic-add-006.html    |  44 ++++++++
 ...multicol-span-all-dynamic-add-007-ref.html |  32 ++++++
 .../multicol-span-all-dynamic-add-007.html    |  50 +++++++++
 ...multicol-span-all-dynamic-add-008-ref.html |  30 ++++++
 .../multicol-span-all-dynamic-add-008.html    |  48 +++++++++
 ...ticol-span-all-dynamic-remove-001-ref.html |  27 +++++
 .../multicol-span-all-dynamic-remove-001.html |  41 +++++++
 ...ticol-span-all-dynamic-remove-002-ref.html |  28 +++++
 .../multicol-span-all-dynamic-remove-002.html |  41 +++++++
 .../multicol-span-all-dynamic-remove-003.html |  40 +++++++
 ...ticol-span-all-dynamic-remove-004-ref.html |  31 ++++++
 .../multicol-span-all-dynamic-remove-004.html |  45 ++++++++
 ...ticol-span-all-dynamic-remove-005-ref.html |  27 +++++
 .../multicol-span-all-dynamic-remove-005.html |  44 ++++++++
 26 files changed, 1010 insertions(+), 1 deletion(-)
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html

diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 8fbe1f1803d7..4bff0cff3cfb 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -611,6 +611,22 @@ GetIBContainingBlockFor(nsIFrame* aFrame)
   return parentFrame;
 }
 
+static nsIFrame*
+GetMultiColumnContainingBlockFor(nsIFrame* aFrame)
+{
+  MOZ_ASSERT(aFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR),
+             "Should only be called if the frame has a multi-column ancestor!");
+
+  nsIFrame* current = aFrame->GetParent();
+  while (current && !current->IsColumnSetWrapperFrame()) {
+    current = current->GetParent();
+  }
+
+  MOZ_ASSERT(current, "No ColumnSetWrapperFrame in a valid column hierarchy?");
+
+  return current;
+}
+
 // This is a bit slow, but sometimes we need it.
 static bool
 ParentIsWrapperAnonBox(nsIFrame* aParent)
@@ -8719,6 +8735,50 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame)
   MOZ_ASSERT(aFrame == aFrame->FirstContinuation(),
              "aFrame not the result of GetPrimaryFrame()?");
 
+  if (aFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
+    nsIFrame* parent = aFrame->GetParent();
+    bool needsReframe =
+      // 1. Removing a column-span may lead to an empty
+      // ::-moz-column-span-wrapper.
+      aFrame->IsColumnSpan() ||
+      // 2. Removing the only child of a ::-moz-column-content whose
+      // ColumnSet parent has a previous column-span sibling requires
+      // reframing since we might connect the ColumnSet's next column-span
+      // sibling (if there's one). Note that this isn't actually needed if
+      // the ColumnSet is at the end of ColumnSetWrapper since we create
+      // empty ones at the end anyway, but we're not worried about
+      // optimizing that case.
+      (parent->Style()->GetPseudo() == nsCSSAnonBoxes::columnContent() &&
+       // The only child in ::-moz-column-content (might be tall enough to
+       // split across columns)
+       !aFrame->GetPrevSibling() && !aFrame->GetNextSibling() &&
+       // That ::-moz-column-content is the first column.
+       !parent->GetPrevInFlow() &&
+       // The ColumnSet containing ::-moz-column-set has a previous sibling
+       // that is a column-span.
+       parent->GetPrevContinuation());
+
+    if (needsReframe) {
+      nsIFrame* containingBlock = GetMultiColumnContainingBlockFor(aFrame);
+
+#ifdef DEBUG
+      if (IsFramePartOfIBSplit(aFrame)) {
+        nsIFrame* ibContainingBlock = GetIBContainingBlockFor(aFrame);
+        MOZ_ASSERT(containingBlock == ibContainingBlock ||
+                   nsLayoutUtils::IsProperAncestorFrame(containingBlock,
+                                                        ibContainingBlock),
+                   "Multi-column containing block should be equal to or be the "
+                   "ancestor of the IB containing block!");
+      }
+#endif
+
+      TRACE("Multi-column");
+      RecreateFramesForContent(containingBlock->GetContent(),
+                               InsertionKind::Async);
+      return true;
+    }
+  }
+
   if (IsFramePartOfIBSplit(aFrame)) {
     // The removal functions can't handle removal of an {ib} split directly; we
     // need to rebuild the containing block.
@@ -12017,6 +12077,46 @@ nsCSSFrameConstructor::WipeContainingBlock(nsFrameConstructorState& aState,
     }
   }
 
+  // Situation #6 is a column hierarchy that's getting new children.
+  if (aFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
+    if (aFrame->IsColumnSetWrapperFrame()) {
+      // Reframe the multi-column container whenever elements insert/append
+      // into it.
+      TRACE("Multi-column");
+      RecreateFramesForContent(aFrame->GetContent(), InsertionKind::Async);
+      return true;
+    }
+
+    bool anyColumnSpanItems = false;
+    for (FCItemIterator iter(aItems); !iter.IsDone(); iter.Next()) {
+      if (iter.item().mComputedStyle->StyleColumn()->IsColumnSpanStyle()) {
+        anyColumnSpanItems = true;
+        break;
+      }
+    }
+
+    bool needsReframe =
+      // 1. Insert / append any column-span children.
+      anyColumnSpanItems ||
+      // 2. GetInsertionPrevSibling() modifies insertion parent. If the prev
+      // sibling is a column-span, aFrame ends up being the
+      // column-span-wrapper.
+      aFrame->Style()->GetPseudo() == nsCSSAnonBoxes::columnSpanWrapper() ||
+      // 3. Append into {ib} split container. There might be room for
+      // optimization, but let's reframe for correctness...
+      IsFramePartOfIBSplit(aFrame);
+
+    if (needsReframe) {
+      TRACE("Multi-column");
+      RecreateFramesForContent(
+        GetMultiColumnContainingBlockFor(aFrame)->GetContent(),
+        InsertionKind::Async);
+      return true;
+    }
+
+    return false;
+  }
+
   // Now we have several cases involving {ib} splits.  Put them all in a
   // do/while with breaks to take us to the "go and reconstruct" code.
   do {
@@ -12132,7 +12232,7 @@ nsCSSFrameConstructor::ReframeContainingBlock(nsIFrame* aFrame)
         printf("  ==> blockContent=%p\n", blockContent);
       }
 #endif
-      RecreateFramesForContent(blockContent->AsElement(), InsertionKind::Async);
+      RecreateFramesForContent(blockContent, InsertionKind::Async);
       return;
     }
   }
diff --git a/layout/generic/ColumnSetWrapperFrame.cpp b/layout/generic/ColumnSetWrapperFrame.cpp
index 5f241b71a906..bb33bea32998 100644
--- a/layout/generic/ColumnSetWrapperFrame.cpp
+++ b/layout/generic/ColumnSetWrapperFrame.cpp
@@ -33,6 +33,24 @@ ColumnSetWrapperFrame::ColumnSetWrapperFrame(ComputedStyle* aStyle)
 {
 }
 
+nsContainerFrame*
+ColumnSetWrapperFrame::GetContentInsertionFrame()
+{
+  nsIFrame* columnSet = PrincipalChildList().OnlyChild();
+  if (columnSet) {
+    // We have only one child, which means we don't have any column-span
+    // descendants. Thus we can safely return our only ColumnSet child's
+    // insertion frame as ours.
+    MOZ_ASSERT(columnSet->IsColumnSetFrame());
+    return columnSet->GetContentInsertionFrame();
+  }
+
+  // We have column-span descendants. Return ourselves as the insertion
+  // frame to let nsCSSFrameConstructor::WipeContainingBlock() figure out
+  // what to do.
+  return this;
+}
+
 void
 ColumnSetWrapperFrame::AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult)
 {
diff --git a/layout/generic/ColumnSetWrapperFrame.h b/layout/generic/ColumnSetWrapperFrame.h
index 0660a7294ab4..79170bd938b7 100644
--- a/layout/generic/ColumnSetWrapperFrame.h
+++ b/layout/generic/ColumnSetWrapperFrame.h
@@ -33,6 +33,8 @@ public:
                                                      ComputedStyle* aStyle,
                                                      nsFrameState aStateFlags);
 
+  nsContainerFrame* GetContentInsertionFrame() override;
+
   void AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aResult) override;
 
 #ifdef DEBUG_FRAME_DUMP
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html
new file mode 100644
index 000000000000..9f76ea15a0da
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Add the spanner as the first child of the columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <h3>spanner</h3>
+      <div>block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html
new file mode 100644
index 000000000000..82b240cb91f9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-001.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add the spanner as the first child of the columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-001-ref.html">
+  <meta name="assert" content="This test checks a dynamically added 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add the spanner as the first child of the columns. */
+    var spanner = document.createElement("h3");
+    var text = document.createTextNode("spanner");
+    spanner.appendChild(text);
+
+    var column = document.getElementById("column");
+    column.insertBefore(spanner, column.children[0]);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html
new file mode 100644
index 000000000000..94f3028a473a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Add the spanner as the second child of the columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>block1</div>
+      <h3>spanner</h3>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html
new file mode 100644
index 000000000000..67eeff63ebf2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-002.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add the spanner as the second child of the columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-002-ref.html">
+  <meta name="assert" content="This test checks a dynamically added 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add the spanner as the second child of the columns. */
+    var spanner = document.createElement("h3");
+    var text = document.createTextNode("spanner");
+    spanner.appendChild(text);
+
+    var column = document.getElementById("column");
+    column.insertBefore(spanner, column.children[1]);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html
new file mode 100644
index 000000000000..da623535087b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Add the spanner in block1. It should correctly span across all columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>block1<h3>spanner</h3></div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html
new file mode 100644
index 000000000000..a9dd225aca1f
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-003.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add the spanner in block1. It should correctly span across all columns</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-003-ref.html">
+  <meta name="assert" content="This test checks a dynamically added 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add the spanner in block1. It should correctly span across all columns. */
+    var spanner = document.createElement("h3");
+    var text = document.createTextNode("spanner");
+    spanner.appendChild(text);
+
+    var block1 = document.getElementById("block1");
+    block1.appendChild(spanner);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div id="block1">block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html
new file mode 100644
index 000000000000..1afda92071fc
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Add the spanner to the inner column</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  body {
+    width: 600px;
+  }
+  article {
+    column-count: 2;
+    column-rule: 6px solid;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article>
+      <article>
+        <div>inner block1</div>
+        <h3>spanner</h3>
+        <div>inner block2</div>
+      </article>
+      <article>
+        <div>inner block3</div>
+        <h3>static spanner</h3>
+        <div>inner block4</div>
+      </article>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html
new file mode 100644
index 000000000000..646fb3324510
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-004.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add the spanner to the inner column</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-004-ref.html">
+  <meta name="assert" content="This test checks a dynamically added 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add the spanner to the inner column. */
+    var spanner = document.createElement("h3");
+    var text = document.createTextNode("spanner");
+    spanner.appendChild(text);
+
+    var innerColumn = document.getElementById("inner-column");
+    innerColumn.insertBefore(spanner, innerColumn.children[1]);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  body {
+    width: 600px;
+  }
+  article {
+    column-count: 2;
+    column-rule: 6px solid;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <article id="inner-column">
+        <div>inner block1</div>
+        <div>inner block2</div>
+      </article>
+      <article>
+        <div>inner block3</div>
+        <h3>static spanner</h3>
+        <div>inner block4</div>
+      </article>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html
new file mode 100644
index 000000000000..87d7f1b7fda8
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-005.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add block1 before block2. It should join the column content box with
+    block2, not with the spanner</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-001-ref.html">
+  <meta name="assert" content="This test checks a dynamically added block element should be rendered correctly in a column hierarchy containing a column-span.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add block1 before block2. It should join the column content box with
+       block2, not with the spanner. */
+    var block = document.createElement("div");
+    var text = document.createTextNode("block1");
+    block.appendChild(text);
+
+    var column = document.getElementById("column");
+    column.insertBefore(block, column.children[1]);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <h3>spanner</h3>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html
new file mode 100644
index 000000000000..9b5c1dced065
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-006.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Append a text in column-span</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-002-ref.html">
+  <meta name="assert" content="This test checks adding a text in column-span should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Append a text in column-span */
+    var text = document.createTextNode("spanner");
+    var spanner = document.getElementById("spanner");
+    spanner.appendChild(text)
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <h3 id="spanner"></h3>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html
new file mode 100644
index 000000000000..7f68a45a2c4a
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Append the block to the inline element which contains "column-span"</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <span id="span">
+        inline1
+        <h3>spanner</h3>
+        <div>block1</div>
+        inline2
+        <div>block2</div>
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html
new file mode 100644
index 000000000000..cdaaf430f55b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-007.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Append the block to the inline element which contains "column-span"</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-007-ref.html">
+  <meta name="assert" content="This test checks a dynamically added block element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Append the block to the inline element which contains "column-span". */
+    var block = document.createElement("div");
+    var text = document.createTextNode("block2");
+    block.appendChild(text);
+
+    var span = document.getElementById("span");
+    span.appendChild(block);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <span id="span">
+        inline1
+        <h3>spanner</h3>
+        <div>block1</div>
+        inline2
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html
new file mode 100644
index 000000000000..c2df383b9394
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Add a nested multi-column spanner to the outer column</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-count: 2;
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>block1</div>
+      <h3>multi-column spanner</h3>
+      <h3>spanner</h3>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html
new file mode 100644
index 000000000000..14aeac8bca2b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-add-008.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Add a nested multi-column spanner to the outer column</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-add-008-ref.html">
+  <meta name="assert" content="This test checks a dynamically added 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    /* Add a nested multi-column spanner to the outer column. */
+    var spanner = document.createElement("h3");
+    var text = document.createTextNode("multi-column spanner");
+    spanner.appendChild(text);
+
+    var column = document.getElementById("column");
+    column.insertBefore(spanner, column.children[1]);
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-count: 2;
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <h3>spanner</h3>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html
new file mode 100644
index 000000000000..83c9fd4880f2
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Remove the spanner as the first child</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html
new file mode 100644
index 000000000000..50a59d1225b6
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-001.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove the spanner as the first child</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-001-ref.html">
+  <meta name="assert" content="This test checks removing a 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("spanner").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <h3 id="spanner">spanner</h3>
+      <div>block1</div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html
new file mode 100644
index 000000000000..5bccbd763785
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Remove the spanner in nested blocks</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>block1</div>
+      <div><div></div></div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html
new file mode 100644
index 000000000000..a6e297726982
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-002.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove the spanner in nested blocks</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-002-ref.html">
+  <meta name="assert" content="This test checks removing a 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("spanner").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <div><div><h3 id="spanner">spanner</h3></div></div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html
new file mode 100644
index 000000000000..fa6f167bd93c
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-003.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove the spanner in a block</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-001-ref.html">
+  <meta name="assert" content="This test checks removing a 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("spanner").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div id="block1">block1<h3 id="spanner">spanner</h3></div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html
new file mode 100644
index 000000000000..d6e44f35f840
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004-ref.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Remove the spanner with block siblings in an inline element</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <span>
+        inline1
+        <div>block1</div>
+        inline2
+        <div>block2</div>
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html
new file mode 100644
index 000000000000..99ea3d744d63
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-004.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove the spanner with a block sibling in an inline element</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-004-ref.html">
+  <meta name="assert" content="This test checks removing a 'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("spanner").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <span>
+        inline1
+        <h3 id="spanner">spanner</h3>
+        <div>block1</div>
+        inline2
+        <div>block2</div>
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html
new file mode 100644
index 000000000000..f0c6149b5c28
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Remove a block with spanner siblings</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <h3>spanner1</h3>
+      <h3>spanner2</h3>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html
new file mode 100644
index 000000000000..c0d868885cae
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-005.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove a tall block (spliting across the three columns) with spanner siblings</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-005-ref.html">
+  <meta name="assert" content="This test checks removing a non-'column-span' element should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("block").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  #block {
+    height: 400px;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <h3>spanner1</h3>
+      <div id="block">block</div>
+      <h3>spanner2</h3>
+    </article>
+  </body>
+</html>

From d1f5945760f2d0eee73822cf2bf0ad99bea67336 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Sat, 27 Oct 2018 06:14:13 +0000
Subject: [PATCH 37/77] Bug 1421105 Part 4 - Enable CSS column-span in UA
 stylesheet, and update test expectations. r=dbaron

We use "column-span: all" in ua.css in Part 3. To be able to flip the pref
in individual wpt tests, we need column-span to be always enabled
in UA stylesheets.

Depends on D5210

Differential Revision: https://phabricator.services.mozilla.com/D5212

--HG--
extra : moz-landing-system : lando
---
 servo/components/style/properties/longhands/column.mako.rs      | 2 ++
 .../meta/css/css-multicol/multicol-span-000.xht.ini             | 2 +-
 .../meta/css/css-multicol/multicol-span-all-001.xht.ini         | 2 +-
 .../meta/css/css-multicol/multicol-span-all-002.xht.ini         | 2 +-
 .../meta/css/css-multicol/multicol-span-all-003.xht.ini         | 2 +-
 .../css-multicol/multicol-span-all-block-sibling-003.xht.ini    | 2 +-
 .../css/css-multicol/multicol-span-all-dynamic-add-001.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-002.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-003.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-004.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-005.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-006.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-007.html.ini | 2 ++
 .../css/css-multicol/multicol-span-all-dynamic-add-008.html.ini | 2 ++
 .../css-multicol/multicol-span-all-dynamic-remove-001.html.ini  | 2 ++
 .../css-multicol/multicol-span-all-dynamic-remove-002.html.ini  | 2 ++
 .../css-multicol/multicol-span-all-dynamic-remove-003.html.ini  | 2 ++
 .../css-multicol/multicol-span-all-dynamic-remove-004.html.ini  | 2 ++
 .../css-multicol/multicol-span-all-dynamic-remove-005.html.ini  | 2 ++
 .../meta/css/css-multicol/multicol-span-all-margin-001.xht.ini  | 2 +-
 .../meta/css/css-multicol/multicol-span-all-margin-002.xht.ini  | 2 +-
 .../css-multicol/multicol-span-all-margin-nested-001.xht.ini    | 2 +-
 .../multicol-span-all-margin-nested-firstchild-001.xht.ini      | 2 +-
 .../meta/css/css-multicol/multicol-span-float-001.xht.ini       | 2 +-
 24 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-005.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-007.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-008.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-004.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-005.html.ini

diff --git a/servo/components/style/properties/longhands/column.mako.rs b/servo/components/style/properties/longhands/column.mako.rs
index adc9371e99ff..cc10d605e2d2 100644
--- a/servo/components/style/properties/longhands/column.mako.rs
+++ b/servo/components/style/properties/longhands/column.mako.rs
@@ -65,6 +65,7 @@ ${helpers.predefined_type(
     spec="https://drafts.csswg.org/css-multicol/#propdef-column-rule-color",
 )}
 
+// FIXME: Remove enabled_in="ua" once column-span is enabled on nightly (bug 1423383).
 ${helpers.single_keyword(
     "column-span",
     "none all",
@@ -72,6 +73,7 @@ ${helpers.single_keyword(
     animation_value_type="discrete",
     gecko_enum_prefix="StyleColumnSpan",
     gecko_pref="layout.css.column-span.enabled",
+    enabled_in="ua",
     spec="https://drafts.csswg.org/css-multicol/#propdef-column-span",
     extra_prefixes="moz:layout.css.column-span.enabled",
 )}
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-000.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-000.xht.ini
index 771473d25b6d..13122326d27b 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-000.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-000.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-000.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-001.xht.ini
index dc59421c5bde..44098aa807a1 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-002.xht.ini
index 5ff2c40ba14b..9732e09eaf84 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-002.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-002.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-002.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-003.xht.ini
index 0b36183e5982..053529964eac 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-003.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-003.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-003.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-block-sibling-003.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-block-sibling-003.xht.ini
index cbe19050ab9f..884f1deacdbd 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-block-sibling-003.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-block-sibling-003.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-block-sibling-003.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-001.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-001.html.ini
new file mode 100644
index 000000000000..d3240e383be8
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-001.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-001.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-002.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-002.html.ini
new file mode 100644
index 000000000000..ad1695fd3270
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-002.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-002.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-003.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-003.html.ini
new file mode 100644
index 000000000000..4ff0d9a491d6
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-003.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-003.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-004.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-004.html.ini
new file mode 100644
index 000000000000..f58f6620ce1e
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-004.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-004.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-005.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-005.html.ini
new file mode 100644
index 000000000000..74f294823675
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-005.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-005.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-006.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-006.html.ini
new file mode 100644
index 000000000000..6d19b0c65bda
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-006.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-006.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-007.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-007.html.ini
new file mode 100644
index 000000000000..93fe9596e8fc
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-007.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-007.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-008.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-008.html.ini
new file mode 100644
index 000000000000..548a02f70b2a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-add-008.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-add-008.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-001.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-001.html.ini
new file mode 100644
index 000000000000..5f84918de967
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-001.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-001.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-002.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-002.html.ini
new file mode 100644
index 000000000000..1fd89b11076a
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-002.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-002.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-003.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-003.html.ini
new file mode 100644
index 000000000000..b260f556bca1
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-003.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-003.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-004.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-004.html.ini
new file mode 100644
index 000000000000..06c8b17b88e3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-004.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-004.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-005.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-005.html.ini
new file mode 100644
index 000000000000..f3eadd3b2cce
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-005.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-005.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini
index fdb7283b0d2b..469fec55eeae 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-margin-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini
index c5c319d126fb..f6d46586ee5a 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-002.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-margin-002.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini
index 16c5583a7651..4c447d46dd5b 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-margin-nested-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini
index 6e6addbdcdff..f67249ccceff 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-margin-nested-firstchild-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-all-margin-nested-firstchild-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-float-001.xht.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-float-001.xht.ini
index 0dc5696022b0..fadc76d786fc 100644
--- a/testing/web-platform/meta/css/css-multicol/multicol-span-float-001.xht.ini
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-float-001.xht.ini
@@ -1,2 +1,2 @@
 [multicol-span-float-001.xht]
-  expected: FAIL
+  prefs: [layout.css.column-span.enabled:true]

From 1a47a235fd56dd9581c5724c4fe53391e3afe071 Mon Sep 17 00:00:00 2001
From: Ting-Yu Lin <tlin@mozilla.com>
Date: Thu, 8 Nov 2018 19:11:55 +0000
Subject: [PATCH 38/77] Bug 1421105 Part 5 - Fix anonymous
 -moz-column-span-wrapper block's style is overridden after restyling.
 r=bzbarsky,emilio

The major change in this patch is ::-moz-column-span-wrapper blocks are no
longer linked into the continuation chains when they're created in
CreateColumnSpanSiblings(). We can do that because
::-moz-column-span-wrapper is an non-inheriting anon box, which doesn't need
to be restyled.

This prevents RestyleManager::ProcessPostTraversal or
nsIFrame::UpdateStyleOfOwnedChildFrame, which set the same style on all
continuations of the frame they are working with, from overriding the
::-moz-column-span-wrapper style.

GetNextContinuationWithSameStyle was deleted in bug 1447367. Delete the comment
in nsInlineFrame::UpdateStyleOfOwnedAnonBoxesForIBSplit() to avoid confusion.

This patch also adds another condition to reframe the multi-column container
in MaybeRecreateContainerForFrameRemoval(). That condition is when an
element has a "column-span:all" descendant, i.e. the element's frame has
"column-span:all" siblings (which is created by CreateColumnSpanSiblings).
The added test multicol-span-all-dynamic-remove-006.html will fail without
this patch.

Depends on D5212

Differential Revision: https://phabricator.services.mozilla.com/D9988

--HG--
extra : moz-landing-system : lando
---
 layout/base/RestyleManager.cpp                | 19 +++--
 layout/base/nsCSSFrameConstructor.cpp         | 73 +++++++++---------
 layout/generic/ColumnSetWrapperFrame.cpp      | 74 ++++++++++++++-----
 layout/generic/ColumnSetWrapperFrame.h        |  2 +
 layout/generic/nsIFrame.h                     | 14 +++-
 layout/generic/nsIFrameInlines.h              |  6 ++
 layout/generic/nsInlineFrame.cpp              |  3 -
 ...ticol-span-all-dynamic-remove-006.html.ini |  2 +
 .../multicol-span-all-restyle-001.html.ini    |  2 +
 .../multicol-span-all-restyle-002.html.ini    |  2 +
 .../multicol-span-all-restyle-003.html.ini    |  2 +
 .../multicol-span-all-restyle-004.html.ini    |  2 +
 .../multicol-span-all-dynamic-remove-006.html | 44 +++++++++++
 .../multicol-span-all-restyle-001-ref.html    | 31 ++++++++
 .../multicol-span-all-restyle-001.html        | 43 +++++++++++
 .../multicol-span-all-restyle-002-ref.html    | 33 +++++++++
 .../multicol-span-all-restyle-002.html        | 49 ++++++++++++
 .../multicol-span-all-restyle-003-ref.html    | 32 ++++++++
 .../multicol-span-all-restyle-003.html        | 43 +++++++++++
 .../multicol-span-all-restyle-004-ref.html    | 29 ++++++++
 .../multicol-span-all-restyle-004.html        | 43 +++++++++++
 21 files changed, 487 insertions(+), 61 deletions(-)
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-006.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-001.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-002.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-003.html.ini
 create mode 100644 testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-004.html.ini
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html
 create mode 100644 testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004.html

diff --git a/layout/base/RestyleManager.cpp b/layout/base/RestyleManager.cpp
index b436cb8a0fe7..cd38bc47de47 100644
--- a/layout/base/RestyleManager.cpp
+++ b/layout/base/RestyleManager.cpp
@@ -2009,11 +2009,11 @@ ServoRestyleState::AssertOwner(const ServoRestyleState& aParent) const
 {
   MOZ_ASSERT(mOwner);
   MOZ_ASSERT(!mOwner->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW));
+  MOZ_ASSERT(!mOwner->IsColumnSpanInMulticolSubtree());
   // We allow aParent.mOwner to be null, for cases when we're not starting at
   // the root of the tree.  We also allow aParent.mOwner to be somewhere up our
   // expected owner chain not our immediate owner, which allows us creating long
   // chains of ServoRestyleStates in some cases where it's just not worth it.
-#ifdef DEBUG
   if (aParent.mOwner) {
     const nsIFrame* owner = ExpectedOwnerForChild(mOwner);
     if (owner != aParent.mOwner) {
@@ -2029,7 +2029,6 @@ ServoRestyleState::AssertOwner(const ServoRestyleState& aParent) const
       MOZ_ASSERT(found, "Must have aParent.mOwner on our expected owner chain");
     }
   }
-#endif
 }
 
 nsChangeHint
@@ -2656,6 +2655,13 @@ RestyleManager::ProcessPostTraversal(
     primaryFrame &&
     primaryFrame->HasAnyStateBits(NS_FRAME_OUT_OF_FLOW);
 
+  // We need this because any column-spanner's parent frame is not its DOM
+  // parent's primary frame. We need some special check similar to out-of-flow
+  // frames.
+  const bool isColumnSpan =
+    primaryFrame &&
+    primaryFrame->IsColumnSpanInMulticolSubtree();
+
   // Grab the change hint from Servo.
   bool wasRestyled;
   nsChangeHint changeHint =
@@ -2683,8 +2689,11 @@ RestyleManager::ProcessPostTraversal(
       maybeAnonBoxChild = primaryFrame->GetPlaceholderFrame();
     } else {
       maybeAnonBoxChild = primaryFrame;
-      changeHint = NS_RemoveSubsumedHints(
-        changeHint, aRestyleState.ChangesHandledFor(styleFrame));
+      // Do not subsume change hints for the column-spanner.
+      if (!isColumnSpan) {
+        changeHint = NS_RemoveSubsumedHints(
+          changeHint, aRestyleState.ChangesHandledFor(styleFrame));
+      }
     }
 
     // If the parent wasn't restyled, the styles of our anon box parents won't
@@ -2739,7 +2748,7 @@ RestyleManager::ProcessPostTraversal(
 
   Maybe<ServoRestyleState> thisFrameRestyleState;
   if (styleFrame) {
-    auto type = isOutOfFlow
+    auto type = isOutOfFlow || isColumnSpan
       ? ServoRestyleState::Type::OutOfFlow
       : ServoRestyleState::Type::InFlow;
 
diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp
index 4bff0cff3cfb..a882341b8c39 100644
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -8735,14 +8735,29 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame)
   MOZ_ASSERT(aFrame == aFrame->FirstContinuation(),
              "aFrame not the result of GetPrimaryFrame()?");
 
+  nsIFrame* inFlowFrame =
+    (aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) ?
+      aFrame->GetPlaceholderFrame() : aFrame;
+  MOZ_ASSERT(inFlowFrame, "How did that happen?");
+  MOZ_ASSERT(inFlowFrame == inFlowFrame->FirstContinuation(),
+             "placeholder for primary frame has previous continuations?");
+  nsIFrame* parent = inFlowFrame->GetParent();
+
   if (aFrame->HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR)) {
-    nsIFrame* parent = aFrame->GetParent();
+    nsIFrame* grandparent = parent->GetParent();
+    MOZ_ASSERT(grandparent);
+
     bool needsReframe =
       // 1. Removing a column-span may lead to an empty
       // ::-moz-column-span-wrapper.
       aFrame->IsColumnSpan() ||
-      // 2. Removing the only child of a ::-moz-column-content whose
-      // ColumnSet parent has a previous column-span sibling requires
+      // 2. Removing a frame which has any column-span siblings may also
+      // lead to an empty ::-moz-column-span-wrapper subtree. The
+      // column-span siblings were the frame's children, but later become
+      // the frame's siblings after CreateColumnSpanSiblings().
+      aFrame->GetProperty(nsIFrame::HasColumnSpanSiblings()) ||
+      // 3. Removing the only child of a ::-moz-column-content, whose
+      // ColumnSet grandparent has a previous column-span sibling, requires
       // reframing since we might connect the ColumnSet's next column-span
       // sibling (if there's one). Note that this isn't actually needed if
       // the ColumnSet is at the end of ColumnSetWrapper since we create
@@ -8754,9 +8769,9 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame)
        !aFrame->GetPrevSibling() && !aFrame->GetNextSibling() &&
        // That ::-moz-column-content is the first column.
        !parent->GetPrevInFlow() &&
-       // The ColumnSet containing ::-moz-column-set has a previous sibling
-       // that is a column-span.
-       parent->GetPrevContinuation());
+       // The ColumnSet grandparent has a previous sibling that is a
+       // column-span.
+       grandparent->GetPrevSibling());
 
     if (needsReframe) {
       nsIFrame* containingBlock = GetMultiColumnContainingBlockFor(aFrame);
@@ -8796,14 +8811,6 @@ nsCSSFrameConstructor::MaybeRecreateContainerForFrameRemoval(nsIFrame* aFrame)
     return true;
   }
 
-  nsIFrame* inFlowFrame =
-    (aFrame->GetStateBits() & NS_FRAME_OUT_OF_FLOW) ?
-      aFrame->GetPlaceholderFrame() : aFrame;
-  MOZ_ASSERT(inFlowFrame, "How did that happen?");
-  MOZ_ASSERT(inFlowFrame == inFlowFrame->FirstContinuation(),
-             "placeholder for primary frame has previous continuations?");
-  nsIFrame* parent = inFlowFrame->GetParent();
-
   if (parent && parent->IsDetailsFrame()) {
     HTMLSummaryElement* summary =
       HTMLSummaryElement::FromNode(aFrame->GetContent());
@@ -11072,14 +11079,10 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
   //
   // 3) ColumnSetFrames are linked together as continuations.
   //
-  // 4) Those column-span wrappers are linked together alternately with the
-  //    original block frame and the original block's continuations. That
-  //    is, original block frame -> column-span wrapper -> original block
-  //    frame's continuation -> column-span wrapper -> ...
-  //
-  //    This is very similar to what we do with block-inside-inline
-  //    splitting, except here we can use continuations rather than the
-  //    IBSibling linkage since the frames are the same type.
+  // 4) Those column-span wrappers are *not* linked together with themselves nor
+  //    with the original block frame. The continuation chain consists of the
+  //    original block frame and the original block's continuations wrapping
+  //    non-column-spans.
   //
   // For example, this HTML
   //  <div id="x" style="column-count: 2;">
@@ -11120,7 +11123,7 @@ nsCSSFrameConstructor::ConstructBlock(nsFrameConstructorState& aState,
   //
   // ColumnSet linkage described in 3): B -> G -> Q
   //
-  // Column-span linkage described in 4): C -> D -> H -> K -> R  and  I -> L -> S
+  // Block linkage described in 4): C -> H -> R  and  I -> S
   //
 
   nsBlockFrame* blockFrame = do_QueryFrame(*aNewFrame);
@@ -11424,8 +11427,10 @@ nsCSSFrameConstructor::CreateColumnSpanSiblings(nsFrameConstructorState& aState,
   ComputedStyle* const initialBlockStyle = aInitialBlock->Style();
   nsContainerFrame* const parentFrame = aInitialBlock->GetParent();
 
+  aInitialBlock->SetProperty(nsIFrame::HasColumnSpanSiblings(), true);
+
   nsFrameItems siblings;
-  nsContainerFrame* lastNewBlock = aInitialBlock;
+  nsContainerFrame* lastNonColumnSpanWrapper = aInitialBlock;
   do {
     MOZ_ASSERT(aChildList.NotEmpty(), "Why call this if child list is empty?");
     MOZ_ASSERT(aChildList.FirstChild()->IsColumnSpan(),
@@ -11448,8 +11453,6 @@ nsCSSFrameConstructor::CreateColumnSpanSiblings(nsFrameConstructorState& aState,
       aState.ReparentAbsoluteItems(columnSpanWrapper);
     }
 
-    lastNewBlock->SetNextContinuation(columnSpanWrapper);
-    columnSpanWrapper->SetPrevContinuation(lastNewBlock);
     siblings.AddChild(columnSpanWrapper);
 
     // Grab the consecutive non-column-span kids, and reparent them into a
@@ -11470,11 +11473,11 @@ nsCSSFrameConstructor::CreateColumnSpanSiblings(nsFrameConstructorState& aState,
       }
     }
 
-    columnSpanWrapper->SetNextContinuation(nonColumnSpanWrapper);
-    nonColumnSpanWrapper->SetPrevContinuation(columnSpanWrapper);
+    lastNonColumnSpanWrapper->SetNextContinuation(nonColumnSpanWrapper);
+    nonColumnSpanWrapper->SetPrevContinuation(lastNonColumnSpanWrapper);
     siblings.AddChild(nonColumnSpanWrapper);
 
-    lastNewBlock = nonColumnSpanWrapper;
+    lastNonColumnSpanWrapper = nonColumnSpanWrapper;
   } while (aChildList.NotEmpty());
 
   return siblings;
@@ -11492,10 +11495,9 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   // contain the runs of blocks, inline frames with our style for the runs of
   // inlines, and put all these frames, in order, into aFrameItems.
   //
-  // When there are column-span blocks in a run of blocks, instead of
-  // creating an anonymous block to wrap them, we create multiple anonymous
-  // blocks that are continuations of each other, wrapping runs of
-  // non-column-spans and runs of column-spans.
+  // When there are column-span blocks in a run of blocks, instead of creating
+  // an anonymous block to wrap them, we create multiple anonymous blocks,
+  // wrapping runs of non-column-spans and runs of column-spans.
   //
   // We return the the first one.  The whole setup is called an {ib}
   // split; in what follows "frames in the split" refers to the anonymous blocks
@@ -11515,8 +11517,9 @@ nsCSSFrameConstructor::ConstructInline(nsFrameConstructorState& aState,
   //
   // 4) The first and last frame in the split are always inlines.
   //
-  // 5) The frames wrapping runs of non-column-spans and runs of
-  //    column-spans are linked together by continuations.
+  // 5) The frames wrapping runs of non-column-spans are linked together as
+  //    continuations. The frames wrapping runs of column-spans are *not*
+  //    linked with each other nor with other non-column-span wrappers.
   //
   // 6) The first and last frame in the chains of blocks are always wrapping
   //    non-column-spans. Both of them are created even if they're empty.
diff --git a/layout/generic/ColumnSetWrapperFrame.cpp b/layout/generic/ColumnSetWrapperFrame.cpp
index bb33bea32998..ad122bc26248 100644
--- a/layout/generic/ColumnSetWrapperFrame.cpp
+++ b/layout/generic/ColumnSetWrapperFrame.cpp
@@ -6,6 +6,8 @@
 
 #include "ColumnSetWrapperFrame.h"
 
+#include "nsContentUtils.h"
+
 using namespace mozilla;
 
 nsBlockFrame*
@@ -58,27 +60,18 @@ ColumnSetWrapperFrame::AppendDirectlyOwnedAnonBoxes(nsTArray<OwnedAnonBox>& aRes
              "Who set NS_FRAME_OWNS_ANON_BOXES on our continuations?");
 
   // It's sufficient to append the first ColumnSet child, which is the first
-  // continuation of the directly owned anon boxes.
+  // continuation of all the other ColumnSets.
+  //
+  // We don't need to append -moz-column-span-wrapper children because
+  // they're non-inheriting anon boxes, and they cannot have any directly
+  // owned anon boxes nor generate any native anonymous content themselves.
+  // Thus, no need to restyle them. AssertColumnSpanWrapperSubtreeIsSane()
+  // asserts all the conditions above which allow us to skip appending
+  // -moz-column-span-wrappers.
   nsIFrame* columnSet = PrincipalChildList().FirstChild();
   MOZ_ASSERT(columnSet && columnSet->IsColumnSetFrame(),
              "The first child should always be ColumnSet!");
   aResult.AppendElement(OwnedAnonBox(columnSet));
-
-#ifdef DEBUG
-  // All the other ColumnSets are the continuation of the first ColumnSet;
-  // the -moz-column-span-wrappers are the continuations of other blocks in
-  // -moz-column-span-contents.
-  for (nsIFrame* child : PrincipalChildList()) {
-    if (child == columnSet) {
-      // Skip testing the first child.
-      continue;
-    }
-    MOZ_ASSERT((child->IsColumnSetFrame() ||
-                child->Style()->GetPseudo() == nsCSSAnonBoxes::columnSpanWrapper()) &&
-               child->GetPrevContinuation(),
-               "Prev continuation is not set properly?");
-  }
-#endif
 }
 
 #ifdef DEBUG_FRAME_DUMP
@@ -102,6 +95,19 @@ ColumnSetWrapperFrame::AppendFrames(ChildListID aListID,
 #endif
 
   nsBlockFrame::AppendFrames(aListID, aFrameList);
+
+#ifdef DEBUG
+  nsIFrame* firstColumnSet = PrincipalChildList().FirstChild();
+  for (nsIFrame* child : PrincipalChildList()) {
+    if (child->IsColumnSpan()) {
+      AssertColumnSpanWrapperSubtreeIsSane(child);
+    } else if (child != firstColumnSet) {
+      // All the other ColumnSets are the continuation of the first ColumnSet.
+      MOZ_ASSERT(child->IsColumnSetFrame() && child->GetPrevContinuation(),
+                 "ColumnSet's prev-continuation is not set properly?");
+    }
+  }
+#endif
 }
 
 void
@@ -119,3 +125,37 @@ ColumnSetWrapperFrame::RemoveFrame(ChildListID aListID, nsIFrame* aOldFrame)
   MOZ_ASSERT_UNREACHABLE("Unsupported operation!");
   nsBlockFrame::RemoveFrame(aListID, aOldFrame);
 }
+
+#ifdef DEBUG
+
+/* static */ void
+ColumnSetWrapperFrame::AssertColumnSpanWrapperSubtreeIsSane(
+  const nsIFrame* aFrame) {
+  MOZ_ASSERT(aFrame->IsColumnSpan(), "aFrame is not column-span?");
+
+  if (!aFrame->Style()->IsAnonBox()) {
+    // aFrame is the primary frame of the element having "column-span: all".
+    // Traverse no further.
+    return;
+  }
+
+  MOZ_ASSERT(aFrame->Style()->GetPseudo() == nsCSSAnonBoxes::columnSpanWrapper(),
+             "aFrame should be ::-moz-column-span-wrapper");
+
+  MOZ_ASSERT(!aFrame->HasAnyStateBits(NS_FRAME_OWNS_ANON_BOXES),
+             "::-moz-column-span-wrapper anonymous blocks cannot own "
+             "other types of anonymous blocks!");
+
+  nsTArray<nsIContent*> anonKids;
+  nsContentUtils::AppendNativeAnonymousChildren(
+    aFrame->GetContent(), anonKids, 0);
+  MOZ_ASSERT(anonKids.IsEmpty(),
+             "We support only column-span on block and inline frame. They "
+             "should not create any native anonymous children.");
+
+  for (const nsIFrame* child : aFrame->PrincipalChildList()) {
+    AssertColumnSpanWrapperSubtreeIsSane(child);
+  }
+}
+
+#endif
diff --git a/layout/generic/ColumnSetWrapperFrame.h b/layout/generic/ColumnSetWrapperFrame.h
index 79170bd938b7..12bc30af6e58 100644
--- a/layout/generic/ColumnSetWrapperFrame.h
+++ b/layout/generic/ColumnSetWrapperFrame.h
@@ -54,6 +54,8 @@ private:
   ~ColumnSetWrapperFrame() override = default;
 
 #ifdef DEBUG
+  static void AssertColumnSpanWrapperSubtreeIsSane(const nsIFrame* aFrame);
+
   // True if frame constructor has finished building this frame and all of
   // its descendants.
   bool mFinishedBuildingColumns = false;
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 389f7a090f42..632b426c56b8 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -1231,6 +1231,13 @@ public:
 
   NS_DECLARE_FRAME_PROPERTY_WITHOUT_DTOR(PlaceholderFrameProperty, nsPlaceholderFrame)
 
+  // HasColumnSpanSiblings property stores whether the frame has any
+  // column-span siblings under the same multi-column ancestor. That is, the
+  // frame's element has column-span descendants without an intervening
+  // multi-column container element in between them. If the frame having
+  // this bit set is removed, we need to reframe the multi-column container
+  NS_DECLARE_FRAME_PROPERTY_SMALL_VALUE(HasColumnSpanSiblings, bool)
+
   mozilla::FrameBidiData GetBidiData() const
   {
     bool exists;
@@ -3890,9 +3897,14 @@ public:
   // Note this only checks computed style, but not testing whether the
   // containing block formatting context was established by a multicol.
   // Callers need to consider NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR to check
-  // whether multi-column effects apply or not.
+  // whether multi-column effects apply or not, or use
+  // IsColumnSpanInMulticolSubtree().
   inline bool IsColumnSpan() const;
 
+  // Like IsColumnSpan(), but this also checks whether the frame has a
+  // multi-column ancestor or not.
+  inline bool IsColumnSpanInMulticolSubtree() const;
+
   /**
    * Returns the vertical-align value to be used for layout, if it is one
    * of the enumerated values.  If this is an SVG text frame, it returns a value
diff --git a/layout/generic/nsIFrameInlines.h b/layout/generic/nsIFrameInlines.h
index 141e121d9406..7ad90feb9598 100644
--- a/layout/generic/nsIFrameInlines.h
+++ b/layout/generic/nsIFrameInlines.h
@@ -97,6 +97,12 @@ nsIFrame::IsColumnSpan() const
   return IsBlockOutside() && StyleColumn()->IsColumnSpanStyle();
 }
 
+bool
+nsIFrame::IsColumnSpanInMulticolSubtree() const
+{
+  return IsColumnSpan() && HasAnyStateBits(NS_FRAME_HAS_MULTI_COLUMN_ANCESTOR);
+}
+
 mozilla::StyleDisplay
 nsIFrame::GetDisplay() const
 {
diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp
index 50c3076276e8..0df42cea8136 100644
--- a/layout/generic/nsInlineFrame.cpp
+++ b/layout/generic/nsInlineFrame.cpp
@@ -975,9 +975,6 @@ nsInlineFrame::UpdateStyleOfOwnedAnonBoxesForIBSplit(
                nsCSSAnonBoxes::mozBlockInsideInlineWrapper(),
                "Unexpected kind of ComputedStyle");
 
-    // We don't want to just walk through using GetNextContinuationWithSameStyle
-    // here, because we want to set updated ComputedStyles on both our
-    // ib-sibling blocks and inlines.
     for (nsIFrame* cont = blockFrame; cont; cont = cont->GetNextContinuation()) {
       cont->SetComputedStyle(newContext);
     }
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-006.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-006.html.ini
new file mode 100644
index 000000000000..b925c74750ec
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-dynamic-remove-006.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-dynamic-remove-006.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-001.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-001.html.ini
new file mode 100644
index 000000000000..a72f985a1f52
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-001.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-restyle-001.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-002.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-002.html.ini
new file mode 100644
index 000000000000..40b1f1dbb6c3
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-002.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-restyle-002.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-003.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-003.html.ini
new file mode 100644
index 000000000000..ab24af0f354c
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-003.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-restyle-003.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-004.html.ini b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-004.html.ini
new file mode 100644
index 000000000000..3a19c3345649
--- /dev/null
+++ b/testing/web-platform/meta/css/css-multicol/multicol-span-all-restyle-004.html.ini
@@ -0,0 +1,2 @@
+[multicol-span-all-restyle-004.html]
+  prefs: [layout.css.column-span.enabled:true]
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html
new file mode 100644
index 000000000000..bbcce11c40fb
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-dynamic-remove-006.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Remove the parent of a column-spanner</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="match" href="multicol-span-all-dynamic-remove-001-ref.html">
+  <meta name="assert" content="This test checks removing the parent of a column-spanner should be rendered correctly.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight;
+
+    document.getElementById("block").remove();
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 3;
+    column-rule: 6px solid;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    outline: 1px solid blue;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>block1</div>
+      <div id="block">
+        <h3>inner spanner</h3>
+        <div>inner block</div>
+      </div>
+      <div>block2</div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html
new file mode 100644
index 000000000000..41bf8631e04b
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001-ref.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Restyle column-span's parent that is a block</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+  }
+  #div {
+    background-color: yellow;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div id="div">
+        <div>yellow block1</div>
+        <h3>spanner (no background-color)</h3>
+        <div>yellow block2</div>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001.html
new file mode 100644
index 000000000000..8d942c13b5c9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-001.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Restyle column-span's parent that is a block</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1072">
+  <link rel="match" href="multicol-span-all-restyle-001-ref.html">
+  <meta name="assert" content="This test checks change the style of the spanner's parent should not affect the spanner.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight; // flush layout
+
+    var div = document.getElementById("div");
+    div.style.backgroundColor = "yellow";
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div id="div">
+        <div>yellow block1</div>
+        <h3>spanner (no background-color)</h3>
+        <div>yellow block2</div>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html
new file mode 100644
index 000000000000..92d469ab78b9
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Restyle column-span's parent that is an inline</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  html {
+    overflow: hidden;
+  }
+  #column {
+    column-count: 1;
+  }
+  #span {
+    position: relative;
+    left: 200px;
+  }
+  h3 {
+    column-span: all;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <span id="span">
+        All text should be offset 200px, except the spanner
+        <h3>Spanner</h3>
+        <div>Some more text</div>
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002.html
new file mode 100644
index 000000000000..e8ad19e8bc11
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-002.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Restyle column-span's parent that is an inline</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1072">
+  <link rel="match" href="multicol-span-all-restyle-002-ref.html">
+  <meta name="assert" content="This test checks change the style of the spanner's parent should not affect the spanner.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight; // flush layout
+
+    var span = document.getElementById("span");
+    span.offsetWidth;
+    span.style.left = "200px";
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  html {
+    overflow: hidden;
+  }
+  #column {
+    column-count: 1;
+  }
+  #span {
+    position: relative;
+    left: 100px;
+  }
+  h3 {
+    column-span: all;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <span id="span">
+        All text should be offset 200px, except the spanner
+        <h3>Spanner</h3>
+        <div>Some more text</div>
+      </span>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html
new file mode 100644
index 000000000000..1396f66dcb79
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Restyle column-span's multi-column container</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+    background-color: yellow;
+  }
+  h3 {
+    column-span: all;
+  }
+  #div {
+    background-color: yellow;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>
+        <div>block1</div>
+        <h3>spanner</h3>
+        <div>block2</div>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003.html
new file mode 100644
index 000000000000..7190f8f87943
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-003.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Restyle column-span's multi-column container</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1072">
+  <link rel="match" href="multicol-span-all-restyle-003-ref.html">
+  <meta name="assert" content="This test checks change the style of the spanner's multi-column container should not affect the spanner.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight; // flush layout
+
+    var column = document.getElementById("column");
+    column.style.backgroundColor = "yellow";
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>
+        <div>block1</div>
+        <h3>spanner</h3>
+        <div>block2</div>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html
new file mode 100644
index 000000000000..cd562cc1e1bf
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test Reference: Restyle the column-span itself</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+    background-color: yellow;
+  }
+  </style>
+
+  <body>
+    <article id="column">
+      <div>
+        <div>block1</div>
+        <h3>yellow spanner</h3>
+        <div>block2</div>
+      </div>
+    </article>
+  </body>
+</html>
diff --git a/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004.html b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004.html
new file mode 100644
index 000000000000..41ac007f0000
--- /dev/null
+++ b/testing/web-platform/tests/css/css-multicol/multicol-span-all-restyle-004.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+  <meta charset="utf-8">
+  <title>CSS Multi-column Layout Test: Restyle the column-span itself</title>
+  <link rel="author" title="Ting-Yu Lin" href="tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-multicol-1/#column-span">
+  <link rel="help" href="https://github.com/w3c/csswg-drafts/issues/1072">
+  <link rel="match" href="multicol-span-all-restyle-004-ref.html">
+  <meta name="assert" content="This test checks change the style of the spanner itself.">
+
+  <script>
+  function runTest() {
+    document.body.offsetHeight; // flush layout
+
+    var spanner = document.getElementById("spanner");
+    spanner.style.backgroundColor = "yellow";
+
+    document.documentElement.removeAttribute("class");
+  }
+  </script>
+
+  <style>
+  #column {
+    column-count: 1;
+    width: 400px;
+    outline: 1px solid black;
+  }
+  h3 {
+    column-span: all;
+  }
+  </style>
+
+  <body onload="runTest();">
+    <article id="column">
+      <div>
+        <div>block1</div>
+        <h3 id="spanner">yellow spanner</h3>
+        <div>block2</div>
+      </div>
+    </article>
+  </body>
+</html>

From 9e0279456558b4a8e4dcaa940c200dd765d484d2 Mon Sep 17 00:00:00 2001
From: Michael Kaply <mozilla@kaply.com>
Date: Thu, 8 Nov 2018 19:34:09 +0000
Subject: [PATCH 39/77] Bug 1504691 - Read certs from local and roaming on
 Windows. r=Felipe

Differential Revision: https://phabricator.services.mozilla.com/D11360

--HG--
extra : moz-landing-system : lando
---
 browser/components/enterprisepolicies/Policies.jsm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index ffb341add9dd..4435fcbb1117 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -144,8 +144,10 @@ var Policies = {
           let platform = AppConstants.platform;
           if (platform == "win") {
             dirs = [
-              // Ugly, but there is no official way to get %USERNAME\AppData\Local\Mozilla.
+              // Ugly, but there is no official way to get %USERNAME\AppData\Roaming\Mozilla.
               Services.dirsvc.get("XREUSysExt", Ci.nsIFile).parent,
+              // Even more ugly, but there is no official way to get %USERNAME\AppData\Local\Mozilla.
+              Services.dirsvc.get("DefProfLRt", Ci.nsIFile).parent.parent,
             ];
           } else if (platform == "macosx" || platform == "linux") {
             dirs = [

From 25ac4aee06da3f6bd0edf71911641343510cdedb Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 8 Nov 2018 03:45:54 +0000
Subject: [PATCH 40/77] Bug 1471535 - pt1 - Split RemoteVideoDecoder into
 GpuDecoderModule and RemoteMediaDataDecoder preparing for new RDD decoder
 work. r=jya

- also makes RemoteMediaDecoder generic so it can work with the remote decoders on the RDD process
- changes VideoDecoderChild to subclass IRemoteDecoderChild

Differential Revision: https://phabricator.services.mozilla.com/D8482

--HG--
rename : dom/media/ipc/RemoteVideoDecoder.cpp => dom/media/ipc/GpuDecoderModule.cpp
rename : dom/media/ipc/RemoteVideoDecoder.h => dom/media/ipc/GpuDecoderModule.h
extra : moz-landing-system : lando
---
 dom/media/ipc/GpuDecoderModule.cpp          |  98 +++++++++
 dom/media/ipc/GpuDecoderModule.h            |  50 +++++
 dom/media/ipc/IRemoteDecoderChild.h         |  47 +++++
 dom/media/ipc/RemoteMediaDataDecoder.cpp    | 140 +++++++++++++
 dom/media/ipc/RemoteMediaDataDecoder.h      |  66 ++++++
 dom/media/ipc/RemoteVideoDecoder.cpp        | 218 --------------------
 dom/media/ipc/RemoteVideoDecoder.h          | 100 ---------
 dom/media/ipc/VideoDecoderChild.h           |  24 +--
 dom/media/ipc/moz.build                     |   9 +-
 dom/media/platforms/PDMFactory.cpp          |   4 +-
 dom/media/platforms/PlatformDecoderModule.h |   7 +-
 11 files changed, 424 insertions(+), 339 deletions(-)
 create mode 100644 dom/media/ipc/GpuDecoderModule.cpp
 create mode 100644 dom/media/ipc/GpuDecoderModule.h
 create mode 100644 dom/media/ipc/IRemoteDecoderChild.h
 create mode 100644 dom/media/ipc/RemoteMediaDataDecoder.cpp
 create mode 100644 dom/media/ipc/RemoteMediaDataDecoder.h
 delete mode 100644 dom/media/ipc/RemoteVideoDecoder.cpp
 delete mode 100644 dom/media/ipc/RemoteVideoDecoder.h

diff --git a/dom/media/ipc/GpuDecoderModule.cpp b/dom/media/ipc/GpuDecoderModule.cpp
new file mode 100644
index 000000000000..ccd64be34b4a
--- /dev/null
+++ b/dom/media/ipc/GpuDecoderModule.cpp
@@ -0,0 +1,98 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "GpuDecoderModule.h"
+
+#include "base/thread.h"
+#include "mozilla/layers/SynchronousTask.h"
+#include "mozilla/StaticPrefs.h"
+
+#include "RemoteMediaDataDecoder.h"
+#include "VideoDecoderChild.h"
+#include "VideoDecoderManagerChild.h"
+
+namespace mozilla {
+
+using base::Thread;
+using dom::VideoDecoderChild;
+using dom::VideoDecoderManagerChild;
+using namespace ipc;
+using namespace layers;
+using namespace gfx;
+
+nsresult
+GpuDecoderModule::Startup()
+{
+  if (!VideoDecoderManagerChild::GetManagerThread()) {
+    return NS_ERROR_FAILURE;
+  }
+  return mWrapped->Startup();
+}
+
+bool
+GpuDecoderModule::SupportsMimeType(const nsACString& aMimeType,
+                                   DecoderDoctorDiagnostics* aDiagnostics) const
+{
+  return mWrapped->SupportsMimeType(aMimeType, aDiagnostics);
+}
+
+bool
+GpuDecoderModule::Supports(const TrackInfo& aTrackInfo,
+                           DecoderDoctorDiagnostics* aDiagnostics) const
+{
+  return mWrapped->Supports(aTrackInfo, aDiagnostics);
+}
+
+static inline bool
+IsRemoteAcceleratedCompositor(KnowsCompositor* aKnows)
+{
+  TextureFactoryIdentifier ident = aKnows->GetTextureFactoryIdentifier();
+  return ident.mParentBackend != LayersBackend::LAYERS_BASIC &&
+         ident.mParentProcessType == GeckoProcessType_GPU;
+}
+
+already_AddRefed<MediaDataDecoder>
+GpuDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
+{
+  if (!StaticPrefs::MediaGpuProcessDecoder() ||
+      !aParams.mKnowsCompositor ||
+      !IsRemoteAcceleratedCompositor(aParams.mKnowsCompositor))
+  {
+    return mWrapped->CreateVideoDecoder(aParams);
+  }
+
+  RefPtr<VideoDecoderChild> child = new VideoDecoderChild();
+  RefPtr<RemoteMediaDataDecoder> object = new RemoteMediaDataDecoder(
+    child,
+    VideoDecoderManagerChild::GetManagerThread(),
+    VideoDecoderManagerChild::GetManagerAbstractThread());
+
+  SynchronousTask task("InitIPDL");
+  MediaResult result(NS_OK);
+  VideoDecoderManagerChild::GetManagerThread()->Dispatch(
+    NS_NewRunnableFunction(
+      "dom::GpuDecoderModule::CreateVideoDecoder",
+      [&]() {
+        AutoCompleteTask complete(&task);
+        result = child->InitIPDL(
+          aParams.VideoConfig(),
+          aParams.mRate.mValue,
+          aParams.mOptions,
+          aParams.mKnowsCompositor->GetTextureFactoryIdentifier());
+      }),
+    NS_DISPATCH_NORMAL);
+  task.Wait();
+
+  if (NS_FAILED(result)) {
+    if (aParams.mError) {
+      *aParams.mError = result;
+    }
+    return nullptr;
+  }
+
+  return object.forget();
+}
+
+} // namespace mozilla
diff --git a/dom/media/ipc/GpuDecoderModule.h b/dom/media/ipc/GpuDecoderModule.h
new file mode 100644
index 000000000000..5c83dc05c44a
--- /dev/null
+++ b/dom/media/ipc/GpuDecoderModule.h
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef include_dom_media_ipc_GpuDecoderModule_h
+#define include_dom_media_ipc_GpuDecoderModule_h
+#include "PlatformDecoderModule.h"
+
+#include "MediaData.h"
+
+namespace mozilla {
+
+// A PDM implementation that creates a RemoteMediaDataDecoder (a
+// MediaDataDecoder) that proxies to a VideoDecoderChild.  The
+// VideoDecoderChild will talk to a VideoDecoderParent running on the
+// GPU process.
+// We currently require a 'wrapped' PDM in order to be able to answer
+// SupportsMimeType and DecoderNeedsConversion. Ideally we'd check these
+// over IPDL using the manager protocol
+class GpuDecoderModule : public PlatformDecoderModule
+{
+public:
+  explicit GpuDecoderModule(PlatformDecoderModule* aWrapped)
+    : mWrapped(aWrapped)
+  {}
+
+  nsresult Startup() override;
+
+  bool SupportsMimeType(const nsACString& aMimeType,
+                        DecoderDoctorDiagnostics* aDiagnostics) const override;
+  bool Supports(const TrackInfo& aTrackInfo,
+                DecoderDoctorDiagnostics* aDiagnostics) const override;
+
+  already_AddRefed<MediaDataDecoder> CreateVideoDecoder(
+    const CreateDecoderParams& aParams) override;
+
+  already_AddRefed<MediaDataDecoder> CreateAudioDecoder(
+    const CreateDecoderParams& aParams) override
+  {
+    return nullptr;
+  }
+
+private:
+  RefPtr<PlatformDecoderModule> mWrapped;
+};
+
+} // namespace mozilla
+
+#endif // include_dom_media_ipc_GpuDecoderModule_h
diff --git a/dom/media/ipc/IRemoteDecoderChild.h b/dom/media/ipc/IRemoteDecoderChild.h
new file mode 100644
index 000000000000..3d2860a2a1cc
--- /dev/null
+++ b/dom/media/ipc/IRemoteDecoderChild.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef include_dom_media_ipc_IRemoteDecoderChild_h
+#define include_dom_media_ipc_IRemoteDecoderChild_h
+
+#include "PlatformDecoderModule.h"
+
+namespace mozilla {
+
+// This interface mirrors the MediaDataDecoder plus a bit (DestroyIPDL)
+// to allow proxying to a remote decoder in RemoteDecoderModule or
+// GpuDecoderModule. RemoteAudioDecoderChild, RemoteVideoDecoderChild,
+// and VideoDecoderChild (for GPU) implement this interface.
+class IRemoteDecoderChild
+{
+public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(IRemoteDecoderChild);
+
+  virtual RefPtr<MediaDataDecoder::InitPromise> Init() = 0;
+  virtual RefPtr<MediaDataDecoder::DecodePromise> Decode(
+    MediaRawData* aSample) = 0;
+  virtual RefPtr<MediaDataDecoder::DecodePromise> Drain() = 0;
+  virtual RefPtr<MediaDataDecoder::FlushPromise> Flush() = 0;
+  virtual void Shutdown() = 0;
+  virtual bool IsHardwareAccelerated(nsACString& aFailureReason) const
+  {
+    return false;
+  }
+  virtual nsCString GetDescriptionName() const = 0;
+  virtual void SetSeekThreshold(const media::TimeUnit& aTime) {}
+  virtual MediaDataDecoder::ConversionRequired NeedsConversion() const
+  {
+    return MediaDataDecoder::ConversionRequired::kNeedNone;
+  }
+
+  virtual void DestroyIPDL() = 0;
+
+protected:
+  virtual ~IRemoteDecoderChild() {}
+};
+
+} // namespace mozilla
+
+#endif // include_dom_media_ipc_IRemoteDecoderChild_h
diff --git a/dom/media/ipc/RemoteMediaDataDecoder.cpp b/dom/media/ipc/RemoteMediaDataDecoder.cpp
new file mode 100644
index 000000000000..2085dd10060a
--- /dev/null
+++ b/dom/media/ipc/RemoteMediaDataDecoder.cpp
@@ -0,0 +1,140 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#include "RemoteMediaDataDecoder.h"
+
+#include "base/thread.h"
+
+#include "IRemoteDecoderChild.h"
+
+namespace mozilla {
+
+using base::Thread;
+
+RemoteMediaDataDecoder::RemoteMediaDataDecoder(
+  IRemoteDecoderChild* aChild,
+  nsIThread* aManagerThread,
+  AbstractThread* aAbstractManagerThread)
+  : mChild(aChild)
+  , mManagerThread(aManagerThread)
+  , mAbstractManagerThread(aAbstractManagerThread)
+{
+}
+
+RemoteMediaDataDecoder::~RemoteMediaDataDecoder()
+{
+  // We're about to be destroyed and drop our ref to
+  // *DecoderChild. Make sure we put a ref into the
+  // task queue for the *DecoderChild thread to keep
+  // it alive until we send the delete message.
+  RefPtr<IRemoteDecoderChild> child = mChild.forget();
+
+  RefPtr<Runnable> task = NS_NewRunnableFunction(
+    "dom::RemoteMediaDataDecoder::~RemoteMediaDataDecoder", [child]() {
+      MOZ_ASSERT(child);
+      child->DestroyIPDL();
+    });
+
+  // Drop our references to the child so that the last ref
+  // always gets released on the manager thread.
+  child = nullptr;
+
+  mManagerThread->Dispatch(task.forget(), NS_DISPATCH_NORMAL);
+}
+
+RefPtr<MediaDataDecoder::InitPromise>
+RemoteMediaDataDecoder::Init()
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  return InvokeAsync(mAbstractManagerThread,
+                     __func__,
+                     [self]() { return self->mChild->Init(); })
+    ->Then(mAbstractManagerThread,
+           __func__,
+           [self, this](TrackType aTrack) {
+             mDescription =
+               mChild->GetDescriptionName() + NS_LITERAL_CSTRING(" (remote)");
+             mIsHardwareAccelerated =
+               mChild->IsHardwareAccelerated(mHardwareAcceleratedReason);
+             mConversion = mChild->NeedsConversion();
+             return InitPromise::CreateAndResolve(aTrack, __func__);
+           },
+           [self](const MediaResult& aError) {
+             return InitPromise::CreateAndReject(aError, __func__);
+           });
+}
+
+RefPtr<MediaDataDecoder::DecodePromise>
+RemoteMediaDataDecoder::Decode(MediaRawData* aSample)
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  RefPtr<MediaRawData> sample = aSample;
+  return InvokeAsync(mAbstractManagerThread, __func__, [self, sample]() {
+    return self->mChild->Decode(sample);
+  });
+}
+
+RefPtr<MediaDataDecoder::FlushPromise>
+RemoteMediaDataDecoder::Flush()
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  return InvokeAsync(mAbstractManagerThread, __func__, [self]() {
+    return self->mChild->Flush();
+  });
+}
+
+RefPtr<MediaDataDecoder::DecodePromise>
+RemoteMediaDataDecoder::Drain()
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  return InvokeAsync(mAbstractManagerThread, __func__, [self]() {
+    return self->mChild->Drain();
+  });
+}
+
+RefPtr<ShutdownPromise>
+RemoteMediaDataDecoder::Shutdown()
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  return InvokeAsync(mAbstractManagerThread, __func__, [self]() {
+    self->mChild->Shutdown();
+    return ShutdownPromise::CreateAndResolve(true, __func__);
+  });
+}
+
+bool
+RemoteMediaDataDecoder::IsHardwareAccelerated(nsACString& aFailureReason) const
+{
+  aFailureReason = mHardwareAcceleratedReason;
+  return mIsHardwareAccelerated;
+}
+
+void
+RemoteMediaDataDecoder::SetSeekThreshold(const media::TimeUnit& aTime)
+{
+  RefPtr<RemoteMediaDataDecoder> self = this;
+  media::TimeUnit time = aTime;
+  mManagerThread->Dispatch(
+    NS_NewRunnableFunction("dom::RemoteMediaDataDecoder::SetSeekThreshold",
+                           [=]() {
+                             MOZ_ASSERT(self->mChild);
+                             self->mChild->SetSeekThreshold(time);
+                           }),
+    NS_DISPATCH_NORMAL);
+}
+
+MediaDataDecoder::ConversionRequired
+RemoteMediaDataDecoder::NeedsConversion() const
+{
+  return mConversion;
+}
+
+nsCString
+RemoteMediaDataDecoder::GetDescriptionName() const
+{
+  return mDescription;
+}
+
+} // namespace mozilla
diff --git a/dom/media/ipc/RemoteMediaDataDecoder.h b/dom/media/ipc/RemoteMediaDataDecoder.h
new file mode 100644
index 000000000000..375ee6f2febb
--- /dev/null
+++ b/dom/media/ipc/RemoteMediaDataDecoder.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=99: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+#ifndef include_dom_media_ipc_RemoteMediaDataDecoder_h
+#define include_dom_media_ipc_RemoteMediaDataDecoder_h
+#include "PlatformDecoderModule.h"
+
+#include "MediaData.h"
+
+namespace mozilla {
+
+class GpuDecoderModule;
+class IRemoteDecoderChild;
+class RemoteMediaDataDecoder;
+
+DDLoggedTypeCustomNameAndBase(RemoteMediaDataDecoder,
+                              RemoteMediaDataDecoder,
+                              MediaDataDecoder);
+
+// A MediaDataDecoder implementation that proxies through IPDL
+// to a 'real' decoder in the GPU or RDD process.
+// All requests get forwarded to a *DecoderChild instance that
+// operates solely on the provided manager and abstract manager threads.
+class RemoteMediaDataDecoder
+  : public MediaDataDecoder
+  , public DecoderDoctorLifeLogger<RemoteMediaDataDecoder>
+{
+public:
+  friend class GpuDecoderModule;
+
+  // MediaDataDecoder
+  RefPtr<InitPromise> Init() override;
+  RefPtr<DecodePromise> Decode(MediaRawData* aSample) override;
+  RefPtr<DecodePromise> Drain() override;
+  RefPtr<FlushPromise> Flush() override;
+  RefPtr<ShutdownPromise> Shutdown() override;
+  bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
+  void SetSeekThreshold(const media::TimeUnit& aTime) override;
+  nsCString GetDescriptionName() const override;
+  ConversionRequired NeedsConversion() const override;
+
+private:
+  RemoteMediaDataDecoder(IRemoteDecoderChild* aChild,
+                         nsIThread* aManagerThread,
+                         AbstractThread* aAbstractManagerThread);
+  ~RemoteMediaDataDecoder();
+
+  // Only ever written to from the reader task queue (during the constructor and
+  // destructor when we can guarantee no other threads are accessing it). Only
+  // read from the manager thread.
+  RefPtr<IRemoteDecoderChild> mChild;
+  nsIThread* mManagerThread;
+  AbstractThread* mAbstractManagerThread;
+  // Only ever written/modified during decoder initialisation.
+  // As such can be accessed from any threads after that.
+  nsCString mDescription = NS_LITERAL_CSTRING("RemoteMediaDataDecoder");
+  bool mIsHardwareAccelerated = false;
+  nsCString mHardwareAcceleratedReason;
+  ConversionRequired mConversion = ConversionRequired::kNeedNone;
+};
+
+} // namespace mozilla
+
+#endif // include_dom_media_ipc_RemoteMediaDataDecoder_h
diff --git a/dom/media/ipc/RemoteVideoDecoder.cpp b/dom/media/ipc/RemoteVideoDecoder.cpp
deleted file mode 100644
index 0c212c698c58..000000000000
--- a/dom/media/ipc/RemoteVideoDecoder.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "RemoteVideoDecoder.h"
-#include "VideoDecoderChild.h"
-#include "VideoDecoderManagerChild.h"
-#include "mozilla/layers/TextureClient.h"
-#include "mozilla/StaticPrefs.h"
-#include "base/thread.h"
-#include "MediaInfo.h"
-#include "ImageContainer.h"
-#include "mozilla/layers/SynchronousTask.h"
-
-namespace mozilla {
-namespace dom {
-
-using base::Thread;
-using namespace ipc;
-using namespace layers;
-using namespace gfx;
-
-RemoteVideoDecoder::RemoteVideoDecoder()
-  : mActor(new VideoDecoderChild())
-  , mDescription("RemoteVideoDecoder")
-  , mIsHardwareAccelerated(false)
-  , mConversion(MediaDataDecoder::ConversionRequired::kNeedNone)
-{
-}
-
-RemoteVideoDecoder::~RemoteVideoDecoder()
-{
-  // We're about to be destroyed and drop our ref to
-  // VideoDecoderChild. Make sure we put a ref into the
-  // task queue for the VideoDecoderChild thread to keep
-  // it alive until we send the delete message.
-  RefPtr<VideoDecoderChild> actor = mActor;
-
-  RefPtr<Runnable> task = NS_NewRunnableFunction(
-    "dom::RemoteVideoDecoder::~RemoteVideoDecoder", [actor]() {
-      MOZ_ASSERT(actor);
-      actor->DestroyIPDL();
-    });
-
-  // Drop out references to the actor so that the last ref
-  // always gets released on the manager thread.
-  actor = nullptr;
-  mActor = nullptr;
-
-  VideoDecoderManagerChild::GetManagerThread()->Dispatch(task.forget(),
-                                                         NS_DISPATCH_NORMAL);
-}
-
-RefPtr<MediaDataDecoder::InitPromise>
-RemoteVideoDecoder::Init()
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  return InvokeAsync(VideoDecoderManagerChild::GetManagerAbstractThread(),
-                     __func__,
-                     [self]() { return self->mActor->Init(); })
-    ->Then(VideoDecoderManagerChild::GetManagerAbstractThread(),
-           __func__,
-           [self, this](TrackType aTrack) {
-             mDescription =
-               mActor->GetDescriptionName() + NS_LITERAL_CSTRING(" (remote)");
-             mIsHardwareAccelerated =
-               mActor->IsHardwareAccelerated(mHardwareAcceleratedReason);
-             mConversion = mActor->NeedsConversion();
-             return InitPromise::CreateAndResolve(aTrack, __func__);
-           },
-           [self](const MediaResult& aError) {
-             return InitPromise::CreateAndReject(aError, __func__);
-           });
-}
-
-RefPtr<MediaDataDecoder::DecodePromise>
-RemoteVideoDecoder::Decode(MediaRawData* aSample)
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  RefPtr<MediaRawData> sample = aSample;
-  return InvokeAsync(VideoDecoderManagerChild::GetManagerAbstractThread(),
-                     __func__,
-                     [self, sample]() { return self->mActor->Decode(sample); });
-}
-
-RefPtr<MediaDataDecoder::FlushPromise>
-RemoteVideoDecoder::Flush()
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  return InvokeAsync(VideoDecoderManagerChild::GetManagerAbstractThread(),
-                     __func__, [self]() { return self->mActor->Flush(); });
-}
-
-RefPtr<MediaDataDecoder::DecodePromise>
-RemoteVideoDecoder::Drain()
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  return InvokeAsync(VideoDecoderManagerChild::GetManagerAbstractThread(),
-                     __func__, [self]() { return self->mActor->Drain(); });
-}
-
-RefPtr<ShutdownPromise>
-RemoteVideoDecoder::Shutdown()
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  return InvokeAsync(VideoDecoderManagerChild::GetManagerAbstractThread(),
-                     __func__, [self]() {
-                       self->mActor->Shutdown();
-                       return ShutdownPromise::CreateAndResolve(true, __func__);
-                     });
-}
-
-bool
-RemoteVideoDecoder::IsHardwareAccelerated(nsACString& aFailureReason) const
-{
-  aFailureReason = mHardwareAcceleratedReason;
-  return mIsHardwareAccelerated;
-}
-
-void
-RemoteVideoDecoder::SetSeekThreshold(const media::TimeUnit& aTime)
-{
-  RefPtr<RemoteVideoDecoder> self = this;
-  media::TimeUnit time = aTime;
-  VideoDecoderManagerChild::GetManagerThread()->Dispatch(
-    NS_NewRunnableFunction("dom::RemoteVideoDecoder::SetSeekThreshold",
-                           [=]() {
-                             MOZ_ASSERT(self->mActor);
-                             self->mActor->SetSeekThreshold(time);
-                           }),
-    NS_DISPATCH_NORMAL);
-}
-
-MediaDataDecoder::ConversionRequired
-RemoteVideoDecoder::NeedsConversion() const
-{
-  return mConversion;
-}
-
-nsresult
-RemoteDecoderModule::Startup()
-{
-  if (!VideoDecoderManagerChild::GetManagerThread()) {
-    return NS_ERROR_FAILURE;
-  }
-  return mWrapped->Startup();
-}
-
-bool
-RemoteDecoderModule::SupportsMimeType(const nsACString& aMimeType,
-                                      DecoderDoctorDiagnostics* aDiagnostics) const
-{
-  return mWrapped->SupportsMimeType(aMimeType, aDiagnostics);
-}
-
-bool
-RemoteDecoderModule::Supports(const TrackInfo& aTrackInfo,
-                              DecoderDoctorDiagnostics* aDiagnostics) const
-{
-  return mWrapped->Supports(aTrackInfo, aDiagnostics);
-}
-
-static inline bool
-IsRemoteAcceleratedCompositor(KnowsCompositor* aKnows)
-{
-  TextureFactoryIdentifier ident = aKnows->GetTextureFactoryIdentifier();
-  return ident.mParentBackend != LayersBackend::LAYERS_BASIC &&
-         ident.mParentProcessType == GeckoProcessType_GPU;
-}
-
-already_AddRefed<MediaDataDecoder>
-RemoteDecoderModule::CreateVideoDecoder(const CreateDecoderParams& aParams)
-{
-  if (!StaticPrefs::MediaGpuProcessDecoder() ||
-      !aParams.mKnowsCompositor ||
-      !IsRemoteAcceleratedCompositor(aParams.mKnowsCompositor))
-  {
-    return mWrapped->CreateVideoDecoder(aParams);
-  }
-
-  RefPtr<RemoteVideoDecoder> object = new RemoteVideoDecoder();
-
-  SynchronousTask task("InitIPDL");
-  MediaResult result(NS_OK);
-  VideoDecoderManagerChild::GetManagerThread()->Dispatch(
-    NS_NewRunnableFunction(
-      "dom::RemoteDecoderModule::CreateVideoDecoder",
-      [&]() {
-        AutoCompleteTask complete(&task);
-        result = object->mActor->InitIPDL(
-          aParams.VideoConfig(),
-          aParams.mRate.mValue,
-          aParams.mOptions,
-          aParams.mKnowsCompositor->GetTextureFactoryIdentifier());
-      }),
-    NS_DISPATCH_NORMAL);
-  task.Wait();
-
-  if (NS_FAILED(result)) {
-    if (aParams.mError) {
-      *aParams.mError = result;
-    }
-    return nullptr;
-  }
-
-  return object.forget();
-}
-
-nsCString
-RemoteVideoDecoder::GetDescriptionName() const
-{
-  return mDescription;
-}
-
-} // namespace dom
-} // namespace mozilla
diff --git a/dom/media/ipc/RemoteVideoDecoder.h b/dom/media/ipc/RemoteVideoDecoder.h
deleted file mode 100644
index 5c1e1ff8e5ac..000000000000
--- a/dom/media/ipc/RemoteVideoDecoder.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=99: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#ifndef include_dom_ipc_RemoteVideoDecoder_h
-#define include_dom_ipc_RemoteVideoDecoder_h
-
-#include "mozilla/RefPtr.h"
-#include "mozilla/DebugOnly.h"
-#include "MediaData.h"
-#include "PlatformDecoderModule.h"
-
-namespace mozilla {
-
-namespace dom {
-class RemoteVideoDecoder;
-}
-DDLoggedTypeCustomNameAndBase(dom::RemoteVideoDecoder,
-                              RemoteVideoDecoder,
-                              MediaDataDecoder);
-
-namespace dom {
-
-class VideoDecoderChild;
-class RemoteDecoderModule;
-
-// A MediaDataDecoder implementation that proxies through IPDL
-// to a 'real' decoder in the GPU process.
-// All requests get forwarded to a VideoDecoderChild instance that
-// operates solely on the VideoDecoderManagerChild thread.
-class RemoteVideoDecoder
-  : public MediaDataDecoder
-  , public DecoderDoctorLifeLogger<RemoteVideoDecoder>
-{
-public:
-  friend class RemoteDecoderModule;
-
-  // MediaDataDecoder
-  RefPtr<InitPromise> Init() override;
-  RefPtr<DecodePromise> Decode(MediaRawData* aSample) override;
-  RefPtr<DecodePromise> Drain() override;
-  RefPtr<FlushPromise> Flush() override;
-  RefPtr<ShutdownPromise> Shutdown() override;
-  bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
-  void SetSeekThreshold(const media::TimeUnit& aTime) override;
-  nsCString GetDescriptionName() const override;
-  ConversionRequired NeedsConversion() const override;
-
-private:
-  RemoteVideoDecoder();
-  ~RemoteVideoDecoder();
-
-  // Only ever written to from the reader task queue (during the constructor and
-  // destructor when we can guarantee no other threads are accessing it). Only
-  // read from the manager thread.
-  RefPtr<VideoDecoderChild> mActor;
-  // Only ever written/modified during decoder initialisation.
-  // As such can be accessed from any threads after that.
-  nsCString mDescription;
-  bool mIsHardwareAccelerated;
-  nsCString mHardwareAcceleratedReason;
-  MediaDataDecoder::ConversionRequired mConversion;
-};
-
-// A PDM implementation that creates RemoteVideoDecoders.
-// We currently require a 'wrapped' PDM in order to be able to answer SupportsMimeType
-// and DecoderNeedsConversion. Ideally we'd check these over IPDL using the manager
-// protocol
-class RemoteDecoderModule : public PlatformDecoderModule
-{
-public:
-  explicit RemoteDecoderModule(PlatformDecoderModule* aWrapped)
-    : mWrapped(aWrapped)
-  {}
-
-  nsresult Startup() override;
-
-  bool SupportsMimeType(const nsACString& aMimeType,
-                        DecoderDoctorDiagnostics* aDiagnostics) const override;
-  bool Supports(const TrackInfo& aTrackInfo,
-                DecoderDoctorDiagnostics* aDiagnostics) const override;
-
-  already_AddRefed<MediaDataDecoder> CreateVideoDecoder(
-    const CreateDecoderParams& aParams) override;
-
-  already_AddRefed<MediaDataDecoder> CreateAudioDecoder(
-    const CreateDecoderParams& aParams) override
-  {
-    return nullptr;
-  }
-
-private:
-  RefPtr<PlatformDecoderModule> mWrapped;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif // include_dom_ipc_RemoteVideoDecoder_h
diff --git a/dom/media/ipc/VideoDecoderChild.h b/dom/media/ipc/VideoDecoderChild.h
index 8eaf65ea0004..d971e9dcab7f 100644
--- a/dom/media/ipc/VideoDecoderChild.h
+++ b/dom/media/ipc/VideoDecoderChild.h
@@ -9,6 +9,7 @@
 #include "MediaResult.h"
 #include "PlatformDecoderModule.h"
 #include "mozilla/dom/PVideoDecoderChild.h"
+#include "IRemoteDecoderChild.h"
 
 namespace mozilla {
 namespace dom {
@@ -18,12 +19,11 @@ class RemoteDecoderModule;
 class VideoDecoderManagerChild;
 
 class VideoDecoderChild final : public PVideoDecoderChild
+                              , public IRemoteDecoderChild
 {
 public:
   explicit VideoDecoderChild();
 
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(VideoDecoderChild)
-
   // PVideoDecoderChild
   mozilla::ipc::IPCResult RecvOutput(const VideoDataIPDL& aData) override;
   mozilla::ipc::IPCResult RecvInputExhausted() override;
@@ -38,22 +38,22 @@ public:
 
   void ActorDestroy(ActorDestroyReason aWhy) override;
 
-  RefPtr<MediaDataDecoder::InitPromise> Init();
-  RefPtr<MediaDataDecoder::DecodePromise> Decode(MediaRawData* aSample);
-  RefPtr<MediaDataDecoder::DecodePromise> Drain();
-  RefPtr<MediaDataDecoder::FlushPromise> Flush();
-  void Shutdown();
-  bool IsHardwareAccelerated(nsACString& aFailureReason) const;
-  nsCString GetDescriptionName() const;
-  void SetSeekThreshold(const media::TimeUnit& aTime);
-  MediaDataDecoder::ConversionRequired NeedsConversion() const;
+  RefPtr<MediaDataDecoder::InitPromise> Init() override;
+  RefPtr<MediaDataDecoder::DecodePromise> Decode(MediaRawData* aSample) override;
+  RefPtr<MediaDataDecoder::DecodePromise> Drain() override;
+  RefPtr<MediaDataDecoder::FlushPromise> Flush() override;
+  void Shutdown() override;
+  bool IsHardwareAccelerated(nsACString& aFailureReason) const override;
+  nsCString GetDescriptionName() const override;
+  void SetSeekThreshold(const media::TimeUnit& aTime) override;
+  MediaDataDecoder::ConversionRequired NeedsConversion() const override;
+  void DestroyIPDL() override;
 
   MOZ_IS_CLASS_INIT
   MediaResult InitIPDL(const VideoInfo& aVideoInfo,
                        float aFramerate,
                        const CreateDecoderParams::OptionSet& aOptions,
                        const layers::TextureFactoryIdentifier& aIdentifier);
-  void DestroyIPDL();
 
   // Called from IPDL when our actor has been destroyed
   void IPDLActorDestroyed();
diff --git a/dom/media/ipc/moz.build b/dom/media/ipc/moz.build
index 2e78460b581c..647aa6b25560 100644
--- a/dom/media/ipc/moz.build
+++ b/dom/media/ipc/moz.build
@@ -10,15 +10,20 @@ IPDL_SOURCES += [
     'PVideoDecoderManager.ipdl',
 ]
 
+EXPORTS.mozilla += [
+    'GpuDecoderModule.h',
+    'RemoteMediaDataDecoder.h',
+]
+
 EXPORTS.mozilla.dom += [
     'MediaIPCUtils.h',
-    'RemoteVideoDecoder.h',
     'VideoDecoderManagerChild.h',
     'VideoDecoderManagerParent.h',
 ]
 
 SOURCES += [
-    'RemoteVideoDecoder.cpp',
+    'GpuDecoderModule.cpp',
+    'RemoteMediaDataDecoder.cpp',
     'VideoDecoderChild.cpp',
     'VideoDecoderManagerChild.cpp',
     'VideoDecoderManagerParent.cpp',
diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
index f0dc06ad45b6..bed4cfee27eb 100644
--- a/dom/media/platforms/PDMFactory.cpp
+++ b/dom/media/platforms/PDMFactory.cpp
@@ -45,7 +45,7 @@
 
 #include "MP4Decoder.h"
 #include "VPXDecoder.h"
-#include "mozilla/dom/RemoteVideoDecoder.h"
+#include "mozilla/GpuDecoderModule.h"
 
 #include "H264.h"
 
@@ -355,7 +355,7 @@ PDMFactory::CreatePDMs()
 #ifdef XP_WIN
   if (StaticPrefs::MediaWmfEnabled() && !IsWin7AndPre2000Compatible()) {
     m = new WMFDecoderModule();
-    RefPtr<PlatformDecoderModule> remote = new dom::RemoteDecoderModule(m);
+    RefPtr<PlatformDecoderModule> remote = new GpuDecoderModule(m);
     StartupPDM(remote);
     mWMFFailedToLoad = !StartupPDM(m);
   } else {
diff --git a/dom/media/platforms/PlatformDecoderModule.h b/dom/media/platforms/PlatformDecoderModule.h
index 24fc59f768e1..dd9d3346784f 100644
--- a/dom/media/platforms/PlatformDecoderModule.h
+++ b/dom/media/platforms/PlatformDecoderModule.h
@@ -33,10 +33,7 @@ namespace layers {
 class ImageContainer;
 } // namespace layers
 
-namespace dom {
-class RemoteDecoderModule;
-}
-
+class GpuDecoderModule;
 class MediaDataDecoder;
 class TaskQueue;
 class CDMProxy;
@@ -214,7 +211,7 @@ protected:
 
   friend class MediaChangeMonitor;
   friend class PDMFactory;
-  friend class dom::RemoteDecoderModule;
+  friend class GpuDecoderModule;
   friend class EMEDecoderModule;
 
   // Indicates if the PlatformDecoderModule supports decoding of aColorDepth.

From 80bd2cd0133caf40f236947707f62326e2d5b46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 20:55:22 +0000
Subject: [PATCH 41/77] Bug 1505875 - Clear out the ShadowRoot host pointer
 when unattaching it. r=smaug

As expected, this is specific to the UA widget stuff.

What's going on here is that given we don't clear out the host when unattaching
the shadow tree, mutating that shadow tree still notifies all the way up to the
document, and that gets all the other code confused, thinking that the node is
connected.

Indeed, the first assertion that fails when loading that test-case in a debug
build is:

  https://searchfox.org/mozilla-central/rev/17f55aee76b7c4610a974cffd3453454e0c8de7b/dom/base/nsNodeUtils.cpp#93

This seems the best fix to avoid confusion. Also clear the mutation observer,
to completely forget about the host.

Chrome code dealing with UA widgets needs to be careful, but I think this is
safe. All the code that assumes that GetHost() doesn't return null is in code
dealing with connected shadow trees only (style system / layout), or in
mutation observer notifications from the host.

Differential Revision: https://phabricator.services.mozilla.com/D11369

--HG--
extra : moz-landing-system : lando
---
 dom/base/Element.cpp                | 11 +++++------
 dom/base/ShadowRoot.cpp             | 11 +++++++++++
 dom/base/ShadowRoot.h               |  4 ++++
 dom/base/crashtests/1505875.html    | 10 ++++++++++
 dom/base/crashtests/crashtests.list |  1 +
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 dom/base/crashtests/1505875.html

diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp
index 6a6726acd10d..f1e62d0d5b95 100644
--- a/dom/base/Element.cpp
+++ b/dom/base/Element.cpp
@@ -1329,25 +1329,24 @@ Element::AttachShadowWithoutNameChecks(ShadowRootMode aMode)
 void
 Element::UnattachShadow()
 {
-  RefPtr<ShadowRoot> shadowRoot = GetShadowRoot();
+  ShadowRoot* shadowRoot = GetShadowRoot();
   if (!shadowRoot) {
     return;
   }
 
   nsAutoScriptBlocker scriptBlocker;
 
-  nsIDocument* doc = GetComposedDoc();
-  if (doc) {
+  if (nsIDocument* doc = GetComposedDoc()) {
     if (nsIPresShell* shell = doc->GetShell()) {
       shell->DestroyFramesForAndRestyle(this);
     }
   }
   MOZ_ASSERT(!GetPrimaryFrame());
 
-  // Simply unhook the shadow root from the element.
-  MOZ_ASSERT(!shadowRoot->HasSlots(), "Won't work when shadow root has slots!");
-  shadowRoot->Unbind();
+  shadowRoot->Unattach();
   SetShadowRoot(nullptr);
+
+  // Beware shadowRoot could be dead after this call.
 }
 
 void
diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp
index 34079b1f2ccb..ecafa6828014 100644
--- a/dom/base/ShadowRoot.cpp
+++ b/dom/base/ShadowRoot.cpp
@@ -178,6 +178,17 @@ ShadowRoot::Unbind()
   }
 }
 
+void
+ShadowRoot::Unattach()
+{
+  MOZ_ASSERT(!HasSlots(), "Won't work!");
+  MOZ_ASSERT(IsUAWidget());
+  MOZ_ASSERT(GetHost());
+  Unbind();
+  GetHost()->RemoveMutationObserver(this);
+  SetHost(nullptr);
+}
+
 void
 ShadowRoot::InvalidateStyleAndLayoutOnSubtree(Element* aElement)
 {
diff --git a/dom/base/ShadowRoot.h b/dom/base/ShadowRoot.h
index 48c1b2051e8d..8fb905bfd8c1 100644
--- a/dom/base/ShadowRoot.h
+++ b/dom/base/ShadowRoot.h
@@ -98,6 +98,10 @@ public:
   // being connected.
   void Unbind();
 
+  // Only intended for UA widgets. Forget our shadow host and unbinds all our
+  // kids.
+  void Unattach();
+
   // Calls BindToTree on each of our kids, and also maybe flags us as being
   // connected.
   nsresult Bind();
diff --git a/dom/base/crashtests/1505875.html b/dom/base/crashtests/1505875.html
new file mode 100644
index 000000000000..24a7d82a09e3
--- /dev/null
+++ b/dom/base/crashtests/1505875.html
@@ -0,0 +1,10 @@
+<script>
+function go() {
+  var r = document.getSelection().getRangeAt(0).cloneRange();
+  a.type = "";
+  r.insertNode(b);
+}
+</script>
+<body onload=go()>
+<input id="a" autofocus type="date">
+<summary id="b">x</summary>
diff --git a/dom/base/crashtests/crashtests.list b/dom/base/crashtests/crashtests.list
index 7519dc026251..2eff4c3a9273 100644
--- a/dom/base/crashtests/crashtests.list
+++ b/dom/base/crashtests/crashtests.list
@@ -245,3 +245,4 @@ load 1445670.html
 load 1458016.html
 pref(dom.webcomponents.shadowdom.enabled,true) load 1459688.html
 load 1460794.html
+pref(dom.webcomponents.shadowdom.enabled,true) load 1505875.html

From b1a4ba8dff9ebb890f67338b773eacb7163e3074 Mon Sep 17 00:00:00 2001
From: Haik Aftandilian <haftandilian@mozilla.com>
Date: Thu, 8 Nov 2018 21:04:19 +0000
Subject: [PATCH 42/77] Bug 1505445 - [Mac] With sandbox early startup, start
 the sandbox after the port exchange r=Alex_Gaynor

Don't start the sandbox until after the port exchange so the parent process does not have to wait longer in ContentParent::LaunchSubprocess() for the (expensive) sandbox_init_with_parameters call to complete in the child. Remove the policy rule allowing access to the parent port now that it is already open when the sandbox is initialized and therefore not needed.

Differential Revision: https://phabricator.services.mozilla.com/D11186

--HG--
extra : moz-landing-system : lando
---
 browser/app/nsBrowserApp.cpp           | 14 --------------
 ipc/app/MozillaRuntimeMain.cpp         | 12 ------------
 security/sandbox/mac/Sandbox.h         |  1 -
 security/sandbox/mac/Sandbox.mm        | 19 +------------------
 security/sandbox/mac/SandboxPolicies.h |  3 ---
 toolkit/xre/nsEmbedFunctions.cpp       | 17 ++++++++++++++++-
 6 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
index b602c58878bf..45dec4a1c055 100644
--- a/browser/app/nsBrowserApp.cpp
+++ b/browser/app/nsBrowserApp.cpp
@@ -43,10 +43,6 @@
 #include "FuzzerDefs.h"
 #endif
 
-#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
-#include "mozilla/Sandbox.h"
-#endif
-
 #ifdef MOZ_LINUX_32_SSE2_STARTUP_ERROR
 #include <cpuid.h>
 #include "mozilla/Unused.h"
@@ -267,16 +263,6 @@ int main(int argc, char* argv[], char* envp[])
 {
   mozilla::TimeStamp start = mozilla::TimeStamp::Now();
 
-#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
-  if (argc > 1 && IsArg(argv[1], "contentproc")) {
-    std::string err;
-    if (!mozilla::EarlyStartMacSandboxIfEnabled(argc, argv, err)) {
-      Output("Sandbox error: %s\n", err.c_str());
-      MOZ_CRASH("Sandbox initialization failed");
-    }
-  }
-#endif
-
 #ifdef MOZ_BROWSER_CAN_BE_CONTENTPROC
   // We are launching as a content process, delegate to the appropriate
   // main
diff --git a/ipc/app/MozillaRuntimeMain.cpp b/ipc/app/MozillaRuntimeMain.cpp
index 7f7360cdd86b..5bf26ccb0573 100644
--- a/ipc/app/MozillaRuntimeMain.cpp
+++ b/ipc/app/MozillaRuntimeMain.cpp
@@ -9,23 +9,11 @@
 #include "mozilla/Bootstrap.h"
 #include "mozilla/WindowsDllBlocklist.h"
 
-#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
-#include "mozilla/Sandbox.h"
-#endif
-
 using namespace mozilla;
 
 int
 main(int argc, char *argv[])
 {
-#if defined(XP_MACOSX) && defined(MOZ_CONTENT_SANDBOX)
-  std::string err;
-  if (!mozilla::EarlyStartMacSandboxIfEnabled(argc, argv, err)) {
-    fprintf(stderr, "Sandbox error: %s\n", err.c_str());
-    MOZ_CRASH("Sandbox initialization failed");
-  }
-#endif
-
 #ifdef HAS_DLL_BLOCKLIST
   DllBlocklist_Initialize(eDllBlocklistInitFlagIsChildProcess);
 #endif
diff --git a/security/sandbox/mac/Sandbox.h b/security/sandbox/mac/Sandbox.h
index 2e28c94e4abc..b161a20a85fa 100644
--- a/security/sandbox/mac/Sandbox.h
+++ b/security/sandbox/mac/Sandbox.h
@@ -69,7 +69,6 @@ typedef struct _MacSandboxInfo {
   std::string testingReadPath3;
   std::string testingReadPath4;
 
-  std::string parentPort;
   std::string crashServerPort;
 
   bool shouldLog;
diff --git a/security/sandbox/mac/Sandbox.mm b/security/sandbox/mac/Sandbox.mm
index 0735dde53932..d56cad090dda 100644
--- a/security/sandbox/mac/Sandbox.mm
+++ b/security/sandbox/mac/Sandbox.mm
@@ -234,10 +234,6 @@ bool StartMacSandbox(MacSandboxInfo const &aInfo, std::string &aErrorMessage)
       params.push_back(aInfo.hasSandboxedProfile ? "TRUE" : "FALSE");
       params.push_back("HAS_WINDOW_SERVER");
       params.push_back(aInfo.hasWindowServer ? "TRUE" : "FALSE");
-      if (!aInfo.parentPort.empty()) {
-        params.push_back("PARENT_PORT");
-        params.push_back(aInfo.parentPort.c_str());
-      }
       if (!aInfo.crashServerPort.empty()) {
         params.push_back("CRASH_PORT");
         params.push_back(aInfo.crashServerPort.c_str());
@@ -342,7 +338,6 @@ GetContentSandboxParamsFromArgs(int aArgc, char** aArgv, MacSandboxInfo& aInfo)
   // line arguments. Return false if any are missing.
   bool foundSandboxLevel = false;
   bool foundValidSandboxLevel = false;
-  bool foundParentPort = false;
   bool foundAppPath = false;
 
   // Read access directories used in testing
@@ -416,13 +411,7 @@ GetContentSandboxParamsFromArgs(int aArgc, char** aArgv, MacSandboxInfo& aInfo)
     }
 #endif // DEBUG
 
-    // Handle positional arguments
-    if (strstr(aArgv[i], "org.mozilla.machname") != NULL) {
-      foundParentPort = true;
-      aInfo.parentPort.assign(aArgv[i]);
-      continue;
-    }
-
+    // Handle crash server positional argument
     if (strstr(aArgv[i], "gecko-crash-server-pipe") != NULL) {
       aInfo.crashServerPort.assign(aArgv[i]);
       continue;
@@ -441,12 +430,6 @@ GetContentSandboxParamsFromArgs(int aArgc, char** aArgv, MacSandboxInfo& aInfo)
     return false;
   }
 
-  if (!foundParentPort) {
-    fprintf(stderr, "Content sandbox disabled due to "
-                    "missing sandbox CLI parent port parameter.\n");
-    return false;
-  }
-
   if (!foundAppPath) {
     fprintf(stderr, "Content sandbox disabled due to "
                     "missing sandbox CLI app path parameter.\n");
diff --git a/security/sandbox/mac/SandboxPolicies.h b/security/sandbox/mac/SandboxPolicies.h
index 2d2dc73338c7..fa340c817fc4 100644
--- a/security/sandbox/mac/SandboxPolicies.h
+++ b/security/sandbox/mac/SandboxPolicies.h
@@ -61,7 +61,6 @@ static const char contentSandboxRules[] = R"SANDBOX_LITERAL(
   (define testingReadPath2 (param "TESTING_READ_PATH2"))
   (define testingReadPath3 (param "TESTING_READ_PATH3"))
   (define testingReadPath4 (param "TESTING_READ_PATH4"))
-  (define parentPort (param "PARENT_PORT"))
   (define crashPort (param "CRASH_PORT"))
 
   (if (string=? should-log "TRUE")
@@ -188,8 +187,6 @@ static const char contentSandboxRules[] = R"SANDBOX_LITERAL(
     (ipc-posix-name-regex #"^CFPBS:"))
 
   (allow signal (target self))
-  (if (string? parentPort)
-    (allow mach-lookup (global-name parentPort)))
   (if (string? crashPort)
     (allow mach-lookup (global-name crashPort)))
   (if (string=? hasWindowServer "TRUE")
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index 8ef8a42d4c6c..842ef211c0d0 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -442,6 +442,13 @@ XRE_InitChildProcess(int aArgc,
 #ifdef XP_MACOSX
   if (aArgc < 1)
     return NS_ERROR_FAILURE;
+
+#if defined(MOZ_CONTENT_SANDBOX)
+  // Save the original number of arguments to pass to the sandbox
+  // setup routine which also uses the crash server argument.
+  int allArgc = aArgc;
+#endif /* MOZ_CONTENT_SANDBOX */
+
   const char* const mach_port_name = aArgv[--aArgc];
 
   Maybe<recordreplay::AutoPassThroughThreadEvents> pt;
@@ -513,8 +520,16 @@ XRE_InitChildProcess(int aArgc,
     return NS_ERROR_FAILURE;
   }
 
+#if defined(MOZ_CONTENT_SANDBOX)
+  std::string sandboxError;
+  if (!EarlyStartMacSandboxIfEnabled(allArgc, aArgv, sandboxError)) {
+    printf_stderr("Sandbox error: %s\n", sandboxError.c_str());
+    MOZ_CRASH("Sandbox initialization failed");
+  }
+#endif /* MOZ_CONTENT_SANDBOX */
+
   pt.reset();
-#endif
+#endif /* XP_MACOSX */
 
   SetupErrorHandling(aArgv[0]);
 

From 3a03e26be598e334c7a6927f88434a0367df1179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 23:44:59 +0100
Subject: [PATCH 43/77] Bug 1505875 - Remove an assertion because I forgot of
 nsXMLPrettyPrinter.

---
 dom/base/ShadowRoot.cpp | 1 -
 dom/base/ShadowRoot.h   | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp
index ecafa6828014..ff6e643ed5e2 100644
--- a/dom/base/ShadowRoot.cpp
+++ b/dom/base/ShadowRoot.cpp
@@ -182,7 +182,6 @@ void
 ShadowRoot::Unattach()
 {
   MOZ_ASSERT(!HasSlots(), "Won't work!");
-  MOZ_ASSERT(IsUAWidget());
   MOZ_ASSERT(GetHost());
   Unbind();
   GetHost()->RemoveMutationObserver(this);
diff --git a/dom/base/ShadowRoot.h b/dom/base/ShadowRoot.h
index 8fb905bfd8c1..b66fcf29bdcc 100644
--- a/dom/base/ShadowRoot.h
+++ b/dom/base/ShadowRoot.h
@@ -98,8 +98,8 @@ public:
   // being connected.
   void Unbind();
 
-  // Only intended for UA widgets. Forget our shadow host and unbinds all our
-  // kids.
+  // Only intended for UA widgets / special shadow roots.
+  // Forgets our shadow host and unbinds all our kids.
   void Unattach();
 
   // Calls BindToTree on each of our kids, and also maybe flags us as being

From 29e5c3b9dd884e72aa064ab748f8f65811e19379 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 8 Nov 2018 14:50:22 +0000
Subject: [PATCH 44/77] Bug 1505608 - Try to ensure the bss section of the
 elfhack testcase stays large enough. r=froydnj

In bug 1470701, we added a dummy global variable so that it ends up in
the bss section, making it large enough for two pointers. Unfortunately,
in some cases, the symbol is eliminated by the linker because it is
unused. So we try to ensure it stays there.

Differential Revision: https://phabricator.services.mozilla.com/D11257

--HG--
extra : moz-landing-system : lando
---
 build/unix/elfhack/test.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/unix/elfhack/test.c b/build/unix/elfhack/test.c
index 8c66c19631d1..e543b48fff46 100644
--- a/build/unix/elfhack/test.c
+++ b/build/unix/elfhack/test.c
@@ -136,8 +136,12 @@ size_t dummy;
 void end_test() {
     static size_t count = 0;
     /* Only exit when both constructors have been called */
-    if (++count == 2)
+    if (++count == 2) {
         ret = 0;
+        // Avoid the dummy variable being stripped out at link time because
+        // it's unused.
+        dummy = 1;
+    }
 }
 
 void test() {

From 004519ecc407fbb0c0a40c2faa0a5d4b8ee0d2dc Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahalberstadt@mozilla.com>
Date: Thu, 8 Nov 2018 22:08:16 +0000
Subject: [PATCH 45/77] Bug 1470266 - [ci] Schedule serviceworker-e10s xpcshell
 tasks with linux64/debug on mozilla-central, r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D11380

--HG--
extra : moz-landing-system : lando
---
 dom/push/test/xpcshell/xpcshell.ini     |  1 +
 taskcluster/ci/config.yml               |  2 +-
 taskcluster/ci/test/xpcshell.yml        |  4 ++++
 testing/xpcshell/remotexpcshelltests.py |  3 ++-
 testing/xpcshell/runxpcshelltests.py    | 10 +++++++---
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/dom/push/test/xpcshell/xpcshell.ini b/dom/push/test/xpcshell/xpcshell.ini
index f9971f99f747..7a8bc35b5753 100644
--- a/dom/push/test/xpcshell/xpcshell.ini
+++ b/dom/push/test/xpcshell/xpcshell.ini
@@ -20,6 +20,7 @@ support-files = PushServiceHandler.js PushServiceHandler.manifest
 [test_notification_version_string.js]
 [test_observer_data.js]
 [test_observer_remoting.js]
+skip-if = serviceworker_e10s
 
 [test_permissions.js]
 run-sequentially = This will delete all existing push subscriptions.
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 20033b1a4142..a265538db540 100755
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -47,7 +47,7 @@ treeherder:
         'W-e10s': 'Web platform tests with e10s'
         'W-sw-e10s': 'Web platform tests with serviceworker redesign and e10s'
         'X': 'Xpcshell tests'
-        'X-e10s': 'Xpcshell tests with e10s'
+        'X-sw': 'Xpcshell tests with serviceworker redesign'
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'
         'BM-L10n': 'Beetmover for locales'
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index b19bfc78139d..56e946b55437 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -1,4 +1,8 @@
 job-defaults:
+    serviceworker-e10s:
+        by-test-platform:
+            linux64/debug: both
+            default: false
     mozharness:
         script:
             by-test-platform:
diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index 0926ece02c08..4fda6f353326 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -349,13 +349,14 @@ class XPCShellRemote(xpcshell.XPCShellTests, object):
         os.remove(localWrapper)
 
     def buildPrefsFile(self, extraPrefs):
-        super(XPCShellRemote, self).buildPrefsFile(extraPrefs)
+        prefs = super(XPCShellRemote, self).buildPrefsFile(extraPrefs)
 
         remotePrefsFile = posixpath.join(self.remoteTestRoot, 'user.js')
         self.device.push(self.prefsFile, remotePrefsFile)
         self.device.chmod(remotePrefsFile, root=True)
         os.remove(self.prefsFile)
         self.prefsFile = remotePrefsFile
+        return prefs
 
     def buildEnvironment(self):
         self.buildCoreEnvironment()
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index 495f6065f284..03e0571bd8a2 100755
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -982,6 +982,7 @@ class XPCShellTests(object):
         profile.set_preferences(prefs)
 
         self.prefsFile = os.path.join(profile.profile, 'user.js')
+        return prefs
 
     def buildCoreEnvironment(self):
         """
@@ -1173,7 +1174,7 @@ class XPCShellTests(object):
         self.failCount += test.failCount
         self.todoCount += test.todoCount
 
-    def updateMozinfo(self):
+    def updateMozinfo(self, prefs):
         # Handle filenames in mozInfo
         if not isinstance(self.mozInfo, dict):
             mozInfoFile = self.mozInfo
@@ -1193,6 +1194,9 @@ class XPCShellTests(object):
             fixedInfo[k] = v
         self.mozInfo = fixedInfo
 
+        self.mozInfo['serviceworker_e10s'] = prefs.get(
+            'dom.serviceWorkers.parent_intercept', False)
+
         mozinfo.update(self.mozInfo)
 
         return True
@@ -1285,12 +1289,12 @@ class XPCShellTests(object):
         self.todoCount = 0
 
         self.setAbsPath()
-        self.buildPrefsFile(options.get('extraPrefs') or [])
+        prefs = self.buildPrefsFile(options.get('extraPrefs') or [])
         self.buildXpcsRunArgs()
 
         self.event = Event()
 
-        if not self.updateMozinfo():
+        if not self.updateMozinfo(prefs):
             return False
 
         self.stack_fixer_function = None

From a4065c43245593ccf36aefc1743a4b5553935637 Mon Sep 17 00:00:00 2001
From: Imanol Fernandez <mortimergoro@gmail.com>
Date: Thu, 8 Nov 2018 22:11:36 +0000
Subject: [PATCH 46/77] Bug 1498246 - Add GeckoView Media API
 r=rbarker,snorp,esawin,jchen,cvan

Add GeckoView Media API which provides a way to listen to HTMLMediaElement events in a GeckoSession and control the playback externally

Differential Revision: https://phabricator.services.mozilla.com/D9026

--HG--
extra : moz-landing-system : lando
---
 .../chrome/geckoview/GeckoViewMediaChild.js   | 433 ++++++++++++++
 mobile/android/chrome/geckoview/geckoview.js  |   6 +
 mobile/android/chrome/geckoview/jar.mn        |   1 +
 .../org/mozilla/geckoview/GeckoSession.java   | 114 +++-
 .../org/mozilla/geckoview/MediaElement.java   | 540 ++++++++++++++++++
 .../modules/geckoview/GeckoViewMedia.jsm      |  33 ++
 mobile/android/modules/geckoview/moz.build    |   1 +
 7 files changed, 1127 insertions(+), 1 deletion(-)
 create mode 100644 mobile/android/chrome/geckoview/GeckoViewMediaChild.js
 create mode 100644 mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
 create mode 100644 mobile/android/modules/geckoview/GeckoViewMedia.jsm

diff --git a/mobile/android/chrome/geckoview/GeckoViewMediaChild.js b/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
new file mode 100644
index 000000000000..7acdc7ee6f7c
--- /dev/null
+++ b/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
@@ -0,0 +1,433 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+ChromeUtils.import("resource://gre/modules/GeckoViewChildModule.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+class GeckoViewMediaChild extends GeckoViewChildModule {
+  onInit() {
+    this._videoIndex = 0;
+    XPCOMUtils.defineLazyGetter(this, "_videos", () =>
+      new Map());
+    this._mediaEvents = [
+      "abort", "canplay", "canplaythrough", "durationchange", "emptied",
+      "ended", "error", "loadeddata", "loadedmetadata", "pause", "play", "playing",
+      "progress", "ratechange", "resize", "seeked", "seeking", "stalled", "suspend",
+      "timeupdate", "volumechange", "waiting",
+    ];
+
+    this._mediaEventCallback = (event) => {
+      this.handleMediaEvent(event);
+    };
+    this._fullscreenMedia = null;
+    this._stateSymbol = Symbol();
+  }
+
+  onEnable() {
+    debug `onEnable`;
+    addEventListener("UAWidgetBindToTree", this, false);
+    addEventListener("MozDOMFullscreen:Entered", this, false);
+    addEventListener("MozDOMFullscreen:Exited", this, false);
+    addEventListener("pagehide", this, false);
+
+    this.messageManager.addMessageListener("GeckoView:MediaObserve", this);
+    this.messageManager.addMessageListener("GeckoView:MediaUnobserve", this);
+    this.messageManager.addMessageListener("GeckoView:MediaPlay", this);
+    this.messageManager.addMessageListener("GeckoView:MediaPause", this);
+    this.messageManager.addMessageListener("GeckoView:MediaSeek", this);
+    this.messageManager.addMessageListener("GeckoView:MediaSetVolume", this);
+    this.messageManager.addMessageListener("GeckoView:MediaSetMuted", this);
+    this.messageManager.addMessageListener("GeckoView:MediaSetPlaybackRate", this);
+  }
+
+  onDisable() {
+    debug `onDisable`;
+
+    removeEventListener("UAWidgetBindToTree", this);
+    removeEventListener("MozDOMFullscreen:Entered", this);
+    removeEventListener("MozDOMFullscreen:Exited", this);
+    removeEventListener("pagehide", this);
+
+    this.messageManager.removeMessageListener("GeckoView:MediaObserve", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaUnobserve", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaPlay", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaPause", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaSeek", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaSetVolume", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaSetMuted", this);
+    this.messageManager.removeMessageListener("GeckoView:MediaSetPlaybackRate", this);
+  }
+
+  receiveMessage(aMsg) {
+    debug `receiveMessage: ${aMsg.name}`;
+
+    const data = aMsg.data;
+    const element = this.findElement(data.id);
+    if (!element) {
+      warn `Didn't find HTMLMediaElement with id: ${data.id}`;
+      return;
+    }
+
+    switch (aMsg.name) {
+      case "GeckoView:MediaObserve":
+        this.observeMedia(element);
+        break;
+      case "GeckoView:MediaUnobserve":
+        this.unobserveMedia(element);
+        break;
+      case "GeckoView:MediaPlay":
+        element.play();
+        break;
+      case "GeckoView:MediaPause":
+        element.pause();
+        break;
+      case "GeckoView:MediaSeek":
+        element.currentTime = data.time;
+        break;
+      case "GeckoView:MediaSetVolume":
+        element.volume = data.volume;
+        break;
+      case "GeckoView:MediaSetMuted":
+        element.muted = !!data.muted;
+        break;
+      case "GeckoView:MediaSetPlaybackRate":
+        element.playbackRate = data.playbackRate;
+        break;
+    }
+  }
+
+  handleEvent(aEvent) {
+    debug `handleEvent: ${aEvent.type}`;
+
+    switch (aEvent.type) {
+      case "UAWidgetBindToTree":
+        this.handleNewMedia(aEvent.composedTarget);
+        break;
+      case "MozDOMFullscreen:Entered":
+        const element = content && content.document.fullscreenElement;
+        if (this.isMedia(element)) {
+          this.handleFullscreenChange(element);
+        } else {
+          // document.fullscreenElement can be a div container instead of the HTMLMediaElement
+          // in some pages (e.g Vimeo).
+          const childrenMedias = element.getElementsByTagName("video");
+          if (childrenMedias && childrenMedias.length > 0) {
+            this.handleFullscreenChange(childrenMedias[0]);
+          }
+        }
+        break;
+      case "MozDOMFullscreen:Exited":
+        this.handleFullscreenChange(null);
+        break;
+      case "pagehide":
+        if (aEvent.target === content.document) {
+          this.handleWindowUnload();
+        }
+        break;
+    }
+  }
+
+  handleWindowUnload() {
+    for (const weakElement of this._videos.values()) {
+      const element = weakElement.get();
+      if (element) {
+        this.unobserveMedia(element);
+      }
+    }
+    if (this._videos.size > 0) {
+      this.notifyMediaRemoveAll();
+    }
+    this._videos.clear();
+    this._fullscreenMedia = null;
+  }
+
+  handleNewMedia(aElement) {
+    if (this.getState(aElement) || !this.isMedia(aElement)) {
+      return;
+    }
+    const state = {
+      id: ++this._videoIndex,
+      notified: false,
+      observing: false,
+    };
+    aElement[this._stateSymbol] = state;
+    this._videos.set(state.id, Cu.getWeakReference(aElement));
+
+    this.notifyNewMedia(aElement);
+  }
+
+  notifyNewMedia(aElement) {
+    this.getState(aElement).notified = true;
+    const message = {
+      type: "GeckoView:MediaAdd",
+      id: this.getState(aElement).id,
+    };
+
+    this.fillMetadata(aElement, message);
+    this.eventDispatcher.sendRequest(message);
+  }
+
+  observeMedia(aElement) {
+    if (this.isObserving(aElement)) {
+      return;
+    }
+    this.getState(aElement).observing = true;
+
+    for (const name of this._mediaEvents) {
+      aElement.addEventListener(name, this._mediaEventCallback, true);
+    }
+
+    // Notify current state
+    this.notifyTimeChange(aElement);
+    this.notifyVolumeChange(aElement);
+    this.notifyRateChange(aElement);
+    if (aElement.readyState >= 1) {
+      this.notifyMetadataChange(aElement);
+    }
+    this.notifyReadyStateChange(aElement);
+    if (!aElement.paused) {
+      this.notifyPlaybackStateChange(aElement, "play");
+    }
+    if (aElement === this._fullscreenMedia) {
+      this.notifyFullscreenChange(aElement, true);
+    }
+    if (this.hasError(aElement)) {
+      this.notifyMediaError(aElement);
+    }
+  }
+
+  unobserveMedia(aElement) {
+    if (!this.isObserving(aElement)) {
+      return;
+    }
+    this.getState(aElement).observing = false;
+    for (const name of this._mediaEvents) {
+      aElement.removeEventListener(name, this._mediaEventCallback);
+    }
+  }
+
+  isMedia(aElement) {
+    if (!aElement) {
+      return false;
+    }
+    const elementType = ChromeUtils.getClassName(aElement);
+    return (elementType === "HTMLVideoElement") || (elementType === "HTMLAudioElement");
+  }
+
+  isObserving(aElement) {
+    return aElement && this.getState(aElement) && this.getState(aElement).observing;
+  }
+
+  findElement(aId) {
+    for (const weakElement of this._videos.values()) {
+      const element = weakElement.get();
+      if (element && this.getState(element).id === aId) {
+        return element;
+      }
+    }
+    return null;
+  }
+
+  getState(aElement) {
+    return aElement[this._stateSymbol];
+  }
+
+  hasError(aElement) {
+    // We either have an explicit error, or networkState is set to NETWORK_NO_SOURCE
+    // after selecting a source.
+    return aElement.error != null ||
+           (aElement.networkState === aElement.NETWORK_NO_SOURCE &&
+            this.hasSources(aElement));
+  }
+
+  hasSources(aElement) {
+    if (aElement.hasAttribute("src") && aElement.getAttribute("src") !== "") {
+      return true;
+    }
+    for (var child = aElement.firstChild; child !== null; child = child.nextElementSibling) {
+      if (child instanceof content.window.HTMLSourceElement) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  fillMetadata(aElement, aOut) {
+    aOut.src = aElement.currentSrc || aElement.src;
+    aOut.width = aElement.videoWidth || 0;
+    aOut.height = aElement.videoHeight || 0;
+    aOut.duration = aElement.duration;
+    aOut.seekable = !!aElement.seekable;
+    if (aElement.audioTracks) {
+      aOut.audioTrackCount = aElement.audioTracks.length;
+    } else {
+      aOut.audioTrackCount = (aElement.mozHasAudio || aElement.webkitAudioDecodedByteCount ||
+        ChromeUtils.getClassName(aElement) === "HTMLAudioElement") ? 1 : 0;
+    }
+    if (aElement.videoTracks) {
+      aOut.videoTrackCount = aElement.videoTracks.length;
+    } else {
+      aOut.videoTrackCount = ChromeUtils.getClassName(aElement) === "HTMLVideoElement" ? 1 : 0;
+    }
+  }
+
+  handleMediaEvent(aEvent) {
+    const element = aEvent.target;
+    if (!this.isObserving(element)) {
+      return;
+    }
+    switch (aEvent.type) {
+      case "timeupdate":
+        this.notifyTimeChange(element);
+        break;
+      case "volumechange":
+        this.notifyVolumeChange(element);
+        break;
+      case "loadedmetadata":
+        this.notifyMetadataChange(element);
+        this.notifyReadyStateChange(element);
+        break;
+      case "ratechange":
+        this.notifyRateChange(element);
+        break;
+      case "error":
+        this.notifyMediaError(element);
+        break;
+      case "progress":
+        this.notifyLoadProgress(element, aEvent);
+        break;
+      case "durationchange": // Fallthrough
+      case "resize":
+        this.notifyMetadataChange(element);
+        break;
+      case "canplay": // Fallthrough
+      case "canplaythrough": // Fallthrough
+      case "loadeddata":
+        this.notifyReadyStateChange(element);
+        break;
+      default:
+        this.notifyPlaybackStateChange(element, aEvent.type);
+        break;
+    }
+  }
+
+  handleFullscreenChange(aElement) {
+    if (aElement === this._fullscreenMedia) {
+      return;
+    }
+
+    if (this.isObserving(this._fullscreenMedia)) {
+      this.notifyFullscreenChange(this._fullscreenMedia, false);
+    }
+    this._fullscreenMedia = aElement;
+
+    if (this.isObserving(aElement)) {
+      this.notifyFullscreenChange(aElement, true);
+    }
+  }
+
+  notifyPlaybackStateChange(aElement, aName) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaPlaybackStateChanged",
+      id: this.getState(aElement).id,
+      playbackState: aName,
+    });
+  }
+
+  notifyReadyStateChange(aElement) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaReadyStateChanged",
+      id: this.getState(aElement).id,
+      readyState: aElement.readyState,
+    });
+  }
+
+  notifyMetadataChange(aElement) {
+    const message = {
+      type: "GeckoView:MediaMetadataChanged",
+      id: this.getState(aElement).id,
+    };
+    this.fillMetadata(aElement, message);
+    this.eventDispatcher.sendRequest(message);
+  }
+
+  notifyLoadProgress(aElement, aEvent) {
+    const message = {
+      type: "GeckoView:MediaProgress",
+      id: this.getState(aElement).id,
+      loadedBytes: aEvent.lengthComputable ? aEvent.loaded : -1,
+      totalBytes: aEvent.lengthComputable ? aEvent.total : -1,
+    };
+    if (aElement.buffered && aElement.buffered.length > 0) {
+      message.timeRangeStarts = [];
+      message.timeRangeEnds = [];
+      for (let i = 0; i < aElement.buffered.length; ++i) {
+        message.timeRangeStarts.push(aElement.buffered.start(i));
+        message.timeRangeEnds.push(aElement.buffered.end(i));
+      }
+    }
+    this.eventDispatcher.sendRequest(message);
+  }
+
+  notifyTimeChange(aElement) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaTimeChanged",
+      id: this.getState(aElement).id,
+      time: aElement.currentTime,
+    });
+  }
+
+  notifyRateChange(aElement) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaRateChanged",
+      id: this.getState(aElement).id,
+      rate: aElement.playbackRate,
+    });
+  }
+
+  notifyVolumeChange(aElement) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaVolumeChanged",
+      id: this.getState(aElement).id,
+      volume: aElement.volume,
+      muted: !!aElement.muted,
+    });
+  }
+
+  notifyFullscreenChange(aElement, aIsFullscreen) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaFullscreenChanged",
+      id: this.getState(aElement).id,
+      fullscreen: aIsFullscreen,
+    });
+  }
+
+  notifyMediaError(aElement) {
+    let code = aElement.error ? aElement.error.code : 0;
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaError",
+      id: this.getState(aElement).id,
+      code: code,
+    });
+  }
+
+  notifyMediaRemove(aElement) {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaRemove",
+      id: this.getState(aElement).id,
+    });
+  }
+
+  notifyMediaRemoveAll() {
+    this.eventDispatcher.sendRequest({
+      type: "GeckoView:MediaRemoveAll",
+    });
+  }
+
+}
+
+const {debug, warn} = GeckoViewMediaChild.initLogging("GeckoViewMedia");
+const module = GeckoViewMediaChild.create(this);
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 530db131c852..1d4c8dc3bb63 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -391,6 +391,12 @@ function startup() {
       resource: "resource://gre/modules/GeckoViewContent.jsm",
       frameScript: "chrome://geckoview/content/GeckoViewContentChild.js",
     },
+  }, {
+    name: "GeckoViewMedia",
+    onEnable: {
+      resource: "resource://gre/modules/GeckoViewMedia.jsm",
+      frameScript: "chrome://geckoview/content/GeckoViewMediaChild.js",
+    },
   }, {
     name: "GeckoViewNavigation",
     onInit: {
diff --git a/mobile/android/chrome/geckoview/jar.mn b/mobile/android/chrome/geckoview/jar.mn
index 52b53b46a391..5b5f51d174dc 100644
--- a/mobile/android/chrome/geckoview/jar.mn
+++ b/mobile/android/chrome/geckoview/jar.mn
@@ -13,6 +13,7 @@ geckoview.jar:
   content/geckoview.xul
   content/geckoview.js
   content/GeckoViewContentChild.js
+  content/GeckoViewMediaChild.js
   content/GeckoViewNavigationChild.js
   content/GeckoViewProgressChild.js
   content/GeckoViewPromptChild.js
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
index e776d26649ee..755798de093f 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -49,6 +49,7 @@ import android.support.annotation.StringDef;
 import android.support.annotation.UiThread;
 import android.util.Base64;
 import android.util.Log;
+import android.util.LongSparseArray;
 import android.view.Surface;
 import android.view.inputmethod.CursorAnchorInfo;
 import android.view.inputmethod.ExtractedText;
@@ -519,10 +520,85 @@ public class GeckoSession extends LayerSession
             }
         };
 
+    private LongSparseArray<MediaElement> mMediaElements = new LongSparseArray<>();
+    /* package */ LongSparseArray<MediaElement> getMediaElements() {
+        return mMediaElements;
+    }
+    private final GeckoSessionHandler<MediaDelegate> mMediaHandler =
+            new GeckoSessionHandler<MediaDelegate>(
+                    "GeckoViewMedia", this,
+                    new String[]{
+                            "GeckoView:MediaAdd",
+                            "GeckoView:MediaRemove",
+                            "GeckoView:MediaRemoveAll",
+                            "GeckoView:MediaReadyStateChanged",
+                            "GeckoView:MediaTimeChanged",
+                            "GeckoView:MediaPlaybackStateChanged",
+                            "GeckoView:MediaMetadataChanged",
+                            "GeckoView:MediaProgress",
+                            "GeckoView:MediaVolumeChanged",
+                            "GeckoView:MediaRateChanged",
+                            "GeckoView:MediaFullscreenChanged",
+                            "GeckoView:MediaError",
+                    }
+            ) {
+                @Override
+                public void handleMessage(final MediaDelegate delegate,
+                                          final String event,
+                                          final GeckoBundle message,
+                                          final EventCallback callback) {
+                    if ("GeckoView:MediaAdd".equals(event)) {
+                        final MediaElement element = new MediaElement(message.getLong("id"), GeckoSession.this);
+                        delegate.onMediaAdd(GeckoSession.this, element);
+                        return;
+                    } else if ("GeckoView:MediaRemoveAll".equals(event)) {
+                        for (int i = 0; i < mMediaElements.size(); i++) {
+                            final long key = mMediaElements.keyAt(i);
+                            delegate.onMediaRemove(GeckoSession.this, mMediaElements.get(key));
+                        }
+                        mMediaElements.clear();
+                        return;
+                    }
+
+                    final long id = message.getLong("id", 0);
+                    final MediaElement element = mMediaElements.get(id);
+                    if (element == null) {
+                        Log.w(LOGTAG, "MediaElement not found for '" + id + "'");
+                        return;
+                    }
+
+                    if ("GeckoView:MediaTimeChanged".equals(event)) {
+                        element.notifyTimeChange(message.getDouble("time"));
+                    } else if ("GeckoView:MediaProgress".equals(event)) {
+                        element.notifyLoadProgress(message);
+                    } else if ("GeckoView:MediaMetadataChanged".equals(event)) {
+                        element.notifyMetadataChange(message);
+                    } else if ("GeckoView:MediaReadyStateChanged".equals(event)) {
+                        element.notifyReadyStateChange(message.getInt("readyState"));
+                    } else if ("GeckoView:MediaPlaybackStateChanged".equals(event)) {
+                        element.notifyPlaybackStateChange(message.getString("playbackState"));
+                    } else if ("GeckoView:MediaVolumeChanged".equals(event)) {
+                        element.notifyVolumeChange(message.getDouble("volume"), message.getBoolean("muted"));
+                    } else if ("GeckoView:MediaRateChanged".equals(event)) {
+                        element.notifyPlaybackRateChange(message.getDouble("rate"));
+                    } else if ("GeckoView:MediaFullscreenChanged".equals(event)) {
+                        element.notifyFullscreenChange(message.getBoolean("fullscreen"));
+                    } else if ("GeckoView:MediaRemove".equals(event)) {
+                        delegate.onMediaRemove(GeckoSession.this, element);
+                        mMediaElements.remove(element.getVideoId());
+                    } else if ("GeckoView:MediaError".equals(event)) {
+                        element.notifyError(message.getInt("code"));
+                    } else {
+                        throw new UnsupportedOperationException(event + " media message not implemented");
+                    }
+                }
+            };
+
+
     /* package */ int handlersCount;
 
     private final GeckoSessionHandler<?>[] mSessionHandlers = new GeckoSessionHandler<?>[] {
-        mContentHandler, mNavigationHandler, mProgressHandler, mScrollHandler,
+        mContentHandler, mMediaHandler, mNavigationHandler, mProgressHandler, mScrollHandler,
         mTrackingProtectionHandler, mPermissionHandler, mSelectionActionDelegate
     };
 
@@ -1595,6 +1671,24 @@ public class GeckoSession extends LayerSession
         mSelectionActionDelegate.setDelegate(delegate, this);
     }
 
+    /**
+     * Set the media callback handler.
+     * This will replace the current handler.
+     * @param delegate An implementation of MediaDelegate.
+     */
+    public void setMediaDelegate(final @Nullable MediaDelegate delegate) {
+        mMediaHandler.setDelegate(delegate, this);
+    }
+
+    /**
+     * Get the Media callback handler.
+     * @return The current Media callback handler.
+     */
+    public @Nullable MediaDelegate getMediaDelegate() {
+        return mMediaHandler.getDelegate();
+    }
+
+
     /**
      * Get the current selection action delegate for this GeckoSession.
      *
@@ -3504,4 +3598,22 @@ public class GeckoSession extends LayerSession
         void notifyAutoFill(@NonNull GeckoSession session, @AutoFillNotification int notification,
                             int virtualId);
     }
+
+    /**
+     * GeckoSession applications implement this interface to handle media events.
+     */
+    public interface MediaDelegate {
+        /**
+         * An HTMLMediaElement has been created.
+         * @param session Session instance.
+         * @param element The media element that was just created.
+         */
+        void onMediaAdd(GeckoSession session, MediaElement element);
+        /**
+         * An HTMLMediaElement has been unloaded.
+         * @param session Session instance.
+         * @param element The media element that was unloaded.
+         */
+        void onMediaRemove(GeckoSession session, MediaElement element);
+    }
 }
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
new file mode 100644
index 000000000000..4563066d45a5
--- /dev/null
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
@@ -0,0 +1,540 @@
+/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
+ * vim: ts=4 sw=4 expandtab:
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.geckoview;
+
+import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
+import android.util.Log;
+
+import org.mozilla.gecko.util.GeckoBundle;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * GeckoSession applications can use this class to handle media events
+ * and control the HTMLMediaElement externally.
+ **/
+public class MediaElement {
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({MEDIA_STATE_PLAY, MEDIA_STATE_PLAYING, MEDIA_STATE_PAUSE,
+             MEDIA_STATE_ENDED, MEDIA_STATE_SEEKING, MEDIA_STATE_SEEKED,
+             MEDIA_STATE_STALLED, MEDIA_STATE_SUSPEND, MEDIA_STATE_WAITING,
+             MEDIA_STATE_ABORT, MEDIA_STATE_EMPTIED})
+    /* package */ @interface MediaStateFlags {}
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({MEDIA_READY_STATE_HAVE_NOTHING, MEDIA_READY_STATE_HAVE_METADATA,
+             MEDIA_READY_STATE_HAVE_CURRENT_DATA, MEDIA_READY_STATE_HAVE_FUTURE_DATA,
+             MEDIA_READY_STATE_HAVE_ENOUGH_DATA})
+
+    /* package */ @interface ReadyStateFlags {}
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({MEDIA_ERROR_NETWORK_NO_SOURCE, MEDIA_ERROR_ABORTED, MEDIA_ERROR_NETWORK,
+             MEDIA_ERROR_DECODE, MEDIA_ERROR_SRC_NOT_SUPPORTED})
+    /* package */ @interface MediaErrorFlags {}
+
+    /**
+     * The media is no longer paused, as a result of the play method, or the autoplay attribute.
+     */
+    public static final int MEDIA_STATE_PLAY = 0;
+    /**
+     * Sent when the media has enough data to start playing, after the play event,
+     * but also when recovering from being stalled, when looping media restarts,
+     * and after seeked, if it was playing before seeking.
+     */
+    public static final int MEDIA_STATE_PLAYING = 1;
+    /**
+     * Sent when the playback state is changed to paused.
+     */
+    public static final int MEDIA_STATE_PAUSE = 2;
+    /**
+     * Sent when playback completes.
+     */
+    public static final int MEDIA_STATE_ENDED = 3;
+    /**
+     * Sent when a seek operation begins.
+     */
+    public static final int MEDIA_STATE_SEEKING = 4;
+    /**
+     * Sent when a seek operation completes.
+     */
+    public static final int MEDIA_STATE_SEEKED = 5;
+    /**
+     * Sent when the user agent is trying to fetch media data,
+     * but data is unexpectedly not forthcoming.
+     */
+    public static final int MEDIA_STATE_STALLED = 6;
+    /**
+     * Sent when loading of the media is suspended. This may happen either because
+     * the download has completed or because it has been paused for any other reason.
+     */
+    public static final int MEDIA_STATE_SUSPEND = 7;
+    /**
+     * Sent when the requested operation (such as playback) is delayed
+     * pending the completion of another operation (such as a seek).
+     */
+    public static final int MEDIA_STATE_WAITING = 8;
+    /**
+     * Sent when playback is aborted; for example, if the media is playing
+     * and is restarted from the beginning, this event is sent.
+     */
+    public static final int MEDIA_STATE_ABORT = 9;
+    /**
+     * The media has become empty. For example, this event is sent if the media
+     * has already been loaded, and the load() method is called to reload it.
+     */
+    public static final int MEDIA_STATE_EMPTIED = 10;
+
+
+    /**
+     * No information is available about the media resource.
+     */
+    public static final int MEDIA_READY_STATE_HAVE_NOTHING = 0;
+    /**
+     * Enough of the media resource has been retrieved that the metadata
+     * attributes are available.
+     */
+    public static final int MEDIA_READY_STATE_HAVE_METADATA = 1;
+    /**
+     * Data is available for the current playback position,
+     * but not enough to actually play more than one frame.
+     */
+    public static final int MEDIA_READY_STATE_HAVE_CURRENT_DATA = 2;
+    /**
+     * Data for the current playback position as well as for at least a little
+     * bit of time into the future is available.
+     */
+    public static final int MEDIA_READY_STATE_HAVE_FUTURE_DATA = 3;
+    /**
+     * Enough data is available—and the download rate is high enough that the media
+     * can be played through to the end without interruption.
+     */
+    public static final int MEDIA_READY_STATE_HAVE_ENOUGH_DATA = 4;
+
+
+    /**
+     * Media source not found or unable to select any of the child elements
+     * for playback during resource selection.
+     */
+    public static final int MEDIA_ERROR_NETWORK_NO_SOURCE = 0;
+    /**
+     * The fetching of the associated resource was aborted by the user's request.
+     */
+    public static final int MEDIA_ERROR_ABORTED = 1;
+    /**
+     * Some kind of network error occurred which prevented the media from being
+     * successfully fetched, despite having previously been available.
+     */
+    public static final int MEDIA_ERROR_NETWORK = 2;
+    /**
+     * Despite having previously been determined to be usable,
+     * an error occurred while trying to decode the media resource, resulting in an error.
+     */
+    public static final int MEDIA_ERROR_DECODE = 3;
+    /**
+     * The associated resource or media provider object has been found to be unsuitable.
+     */
+    public static final int MEDIA_ERROR_SRC_NOT_SUPPORTED = 4;
+
+    /**
+     * Data class with the Metadata associated to a Media Element.
+     **/
+    public static class Metadata {
+        /**
+         * Contains the current media source URI.
+         */
+        public final String currentSource;
+
+        /**
+         * Indicates the duration of the media in seconds.
+         */
+        public final double duration;
+
+        /**
+         * Indicates the width of the video in device pixels.
+         */
+        public final long width;
+
+        /**
+         * Indicates the height of the video in device pixels.
+         */
+        public final long height;
+
+        /**
+         * Indicates if seek operations are compatible with the media.
+         */
+        public final boolean isSeekable;
+
+        /**
+         * Indicates the number of audio tracks included in the media.
+         */
+        public final int audioTrackCount;
+
+        /**
+         * Indicates the number of video tracks included in the media.
+         */
+        public final int videoTrackCount;
+
+        /* package */ Metadata(final GeckoBundle bundle) {
+            currentSource = bundle.getString("src", "");
+            duration = bundle.getDouble("duration", 0);
+            width = bundle.getLong("width", 0);
+            height = bundle.getLong("height", 0);
+            isSeekable = bundle.getBoolean("seekable", false);
+            audioTrackCount = bundle.getInt("audioTrackCount", 0);
+            videoTrackCount = bundle.getInt("videoTrackCount", 0);
+        }
+    }
+
+    /**
+     * Data class that indicates infomation about a media load progress event.
+     **/
+    public static class LoadProgressInfo {
+        /*
+         * Class used to represent a set of time ranges.
+         */
+        public class TimeRange {
+            /* package */ TimeRange(double start, double end) {
+                this.start = start;
+                this.end = end;
+            }
+            /*
+             * The start time of the range in seconds.
+             */
+            public final double start;
+            /*
+             * The end time of the range in seconds.
+             */
+            public final double end;
+        }
+
+        /**
+         * The number of bytes transferred since the beginning of the operation
+         * or -1 if the data is not computable.
+         */
+        public final long loadedBytes;
+
+        /**
+         * The total number of bytes of content that will be transferred during the operation
+         * or -1 if the data is not computable.
+         */
+        public final long totalBytes;
+
+        /**
+         * The ranges of the media source that the browser has currently buffered.
+         * Null if the browser has not buffered any time range or the data is not computable.
+         */
+        public final @Nullable TimeRange[] buffered;
+
+        /* package */ LoadProgressInfo(final GeckoBundle bundle) {
+            loadedBytes = bundle.getLong("loadedBytes", -1);
+            totalBytes = bundle.getLong("loadedBytes", -1);
+            double[] starts = bundle.getDoubleArray("timeRangeStarts");
+            double[] ends = bundle.getDoubleArray("timeRangeEnds");
+            if (starts == null || ends == null) {
+                buffered = null;
+                return;
+            }
+
+            if (starts.length != ends.length) {
+                throw new AssertionError("timeRangeStarts and timeRangeEnds length do not match");
+            }
+
+            buffered = new TimeRange[starts.length];
+            for (int i = 0; i < starts.length; ++i) {
+                buffered[i] = new TimeRange(starts[i], ends[i]);
+            }
+        }
+    }
+
+    /**
+     * This interface allows apps to handle media events.
+     **/
+    public interface Delegate {
+        /**
+         * The media playback state has changed.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param mediaState The playback state of the media.
+         *                   One of the {@link #MEDIA_STATE_PLAY MEDIA_STATE_*} flags.
+         */
+        default void onPlaybackStateChange(MediaElement mediaElement, @MediaStateFlags int mediaState) {}
+
+        /**
+         * The readiness state of the media has changed.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param readyState The readiness state of the media.
+         *                   One of the {@link #MEDIA_READY_STATE_HAVE_NOTHING MEDIA_READY_STATE_*} flags.
+         */
+        default void onReadyStateChange(MediaElement mediaElement, @ReadyStateFlags int readyState) {}
+
+        /**
+         * The media metadata has loaded or changed.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param metaData The MetaData values of the media.
+         */
+        default void onMetadataChange(MediaElement mediaElement, Metadata metaData) {}
+
+        /**
+         * Indicates that a loading operation is in progress for the media.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param progressInfo Information about the load progress and buffered ranges.
+         */
+        default void onLoadProgress(MediaElement mediaElement, LoadProgressInfo progressInfo) {}
+
+        /**
+         * The media audio volume has changed.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param volume The volume of the media.
+         * @param muted True if the media is muted.
+         */
+        default void onVolumeChange(MediaElement mediaElement, double volume, boolean muted) {}
+
+        /**
+         * The current playback time has changed. This event is usually dispatched every 250ms.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param time The current playback time in seconds.
+         */
+        default void onTimeChange(MediaElement mediaElement, double time) {}
+
+        /**
+         * The media playback speed has changed.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param rate The current playback rate. A value of 1.0 indicates normal speed.
+         */
+        default void onPlaybackRateChange(MediaElement mediaElement, double rate) {}
+
+        /**
+         * A media element has entered or exited fullscreen mode.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param fullscreen True if the media has entered full screen mode.
+         */
+        default void onFullscreenChange(MediaElement mediaElement, boolean fullscreen) {}
+
+        /**
+         * An error has occurred.
+         *
+         * @param mediaElement A reference to the MediaElement that dispatched the event.
+         * @param errorCode The error code.
+         *                  One of the {@link #MEDIA_ERROR_NETWORK_NO_SOURCE MEDIA_ERROR_*} flags.
+         */
+        default void onError(MediaElement mediaElement, @MediaErrorFlags int errorCode) {}
+    }
+
+    /* package */ long getVideoId() {
+        return mVideoId;
+    }
+
+    /**
+     * Gets the current the media callback handler.
+     *
+     * @return the current media callback handler.
+     */
+    public @Nullable MediaElement.Delegate getDelegate() {
+        return mDelegate;
+    }
+
+    /**
+     * Sets the media callback handler.
+     * This will replace the current handler.
+     *
+     * @param delegate An implementation of MediaDelegate.
+     */
+    public void setDelegate(final @Nullable MediaElement.Delegate delegate) {
+        if (mDelegate == delegate) {
+            return;
+        }
+        MediaElement.Delegate oldDelegate = mDelegate;
+        mDelegate = delegate;
+        if (oldDelegate != null && mDelegate == null) {
+            mSession.getEventDispatcher().dispatch("GeckoView:MediaUnobserve", createMessage());
+            mSession.getMediaElements().remove(mVideoId);
+        } else if (oldDelegate == null) {
+            mSession.getMediaElements().put(mVideoId, this);
+            mSession.getEventDispatcher().dispatch("GeckoView:MediaObserve", createMessage());
+        }
+    }
+
+    /**
+     * Pauses the media.
+     */
+    public void pause() {
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaPause", createMessage());
+    }
+
+    /**
+     * Plays the media.
+     */
+    public void play() {
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaPlay", createMessage());
+    }
+
+    /**
+     * Seek the media to a given time.
+     *
+     * @param time Seek time in seconds.
+     */
+    public void seek(final double time) {
+        final GeckoBundle message = createMessage();
+        message.putDouble("time", time);
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaSeek", message);
+    }
+
+    /**
+     * Set the volume at which the media will be played.
+     *
+     * @param volume A Volume value. It must fall between 0 and 1, where 0 is effectively muted
+     *               and 1 is the loudest possible value.
+     */
+    public void setVolume(final double volume) {
+        final GeckoBundle message = createMessage();
+        message.putDouble("volume", volume);
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetVolume", message);
+    }
+
+    /**
+     * Mutes the media.
+     *
+     * @param muted True in order to mute the audio.
+     */
+    public void setMuted(final boolean muted) {
+        final GeckoBundle message = createMessage();
+        message.putBoolean("muted", muted);
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetMuted", message);
+    }
+
+    /**
+     * Sets the playback rate at which the media will be played.
+     *
+     * @param playbackRate The rate at which the media will be played.
+     *                     A value of 1.0 indicates normal speed.
+     */
+    public void setPlaybackRate(final double playbackRate) {
+        final GeckoBundle message = createMessage();
+        message.putDouble("playbackRate", playbackRate);
+        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetPlaybackRate", message);
+    }
+
+    // Helper methods used for event observers to update the current video state
+
+    /* package */ void notifyPlaybackStateChange(final String event) {
+        @MediaStateFlags int state;
+        switch (event.toLowerCase()) {
+            case "play":
+                state = MEDIA_STATE_PLAY;
+                break;
+            case "playing":
+                state = MEDIA_STATE_PLAYING;
+                break;
+            case "pause":
+                state = MEDIA_STATE_PAUSE;
+                break;
+            case "ended":
+                state = MEDIA_STATE_ENDED;
+                break;
+            case "seeking":
+                state = MEDIA_STATE_SEEKING;
+                break;
+            case "seeked":
+                state = MEDIA_STATE_SEEKED;
+                break;
+            case "stalled":
+                state = MEDIA_STATE_STALLED;
+                break;
+            case "suspend":
+                state = MEDIA_STATE_SUSPEND;
+                break;
+            case "waiting":
+                state = MEDIA_STATE_WAITING;
+                break;
+            case "abort":
+                state = MEDIA_STATE_ABORT;
+                break;
+            case "emptied":
+                state = MEDIA_STATE_EMPTIED;
+                break;
+            default:
+                throw new UnsupportedOperationException(event + " HTMLMediaElement event not implemented");
+        }
+
+        if (mDelegate != null) {
+            mDelegate.onPlaybackStateChange(this, state);
+        }
+    }
+
+    /* package */ void notifyReadyStateChange(final int readyState) {
+        if (mDelegate != null) {
+            mDelegate.onReadyStateChange(this, readyState);
+        }
+    }
+
+    /* package */ void notifyLoadProgress(final GeckoBundle message) {
+        if (mDelegate != null) {
+            mDelegate.onLoadProgress(this, new LoadProgressInfo(message));
+        }
+    }
+
+    /* package */ void notifyTimeChange(final double currentTime) {
+        if (mDelegate != null) {
+            mDelegate.onTimeChange(this, currentTime);
+        }
+    }
+
+    /* package */ void notifyVolumeChange(final double volume, final boolean muted) {
+        if (mDelegate != null) {
+            mDelegate.onVolumeChange(this, volume, muted);
+        }
+    }
+
+    /* package */ void notifyPlaybackRateChange(final double rate) {
+        if (mDelegate != null) {
+            mDelegate.onPlaybackRateChange(this, rate);
+        }
+    }
+
+    /* package */ void notifyMetadataChange(final GeckoBundle message) {
+        if (mDelegate != null) {
+            mDelegate.onMetadataChange(this, new Metadata(message));
+        }
+    }
+
+    /* package */ void notifyFullscreenChange(final boolean fullscreen) {
+        if (mDelegate != null) {
+            mDelegate.onFullscreenChange(this, fullscreen);
+        }
+    }
+
+    /* package */ void notifyError(final int aCode) {
+        if (mDelegate != null) {
+            mDelegate.onError(this, aCode);
+        }
+    }
+
+    private GeckoBundle createMessage() {
+        final GeckoBundle bundle = new GeckoBundle();
+        bundle.putLong("id", mVideoId);
+        return bundle;
+    }
+
+    /* package */ MediaElement(final long videoId, final GeckoSession session) {
+        mVideoId = videoId;
+        mSession = session;
+    }
+
+    final protected GeckoSession mSession;
+    final protected long mVideoId;
+    protected MediaElement.Delegate mDelegate;
+}
diff --git a/mobile/android/modules/geckoview/GeckoViewMedia.jsm b/mobile/android/modules/geckoview/GeckoViewMedia.jsm
new file mode 100644
index 000000000000..005c0120a8eb
--- /dev/null
+++ b/mobile/android/modules/geckoview/GeckoViewMedia.jsm
@@ -0,0 +1,33 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["GeckoViewMedia"];
+
+ChromeUtils.import("resource://gre/modules/GeckoViewModule.jsm");
+
+class GeckoViewMedia extends GeckoViewModule {
+  onEnable() {
+    this.registerListener([
+      "GeckoView:MediaObserve",
+      "GeckoView:MediaUnobserve",
+      "GeckoView:MediaPlay",
+      "GeckoView:MediaPause",
+      "GeckoView:MediaSeek",
+      "GeckoView:MediaSetVolume",
+      "GeckoView:MediaSetMuted",
+      "GeckoView:MediaSetPlaybackRate",
+    ]);
+  }
+
+  onDisable() {
+    this.unregisterListener();
+  }
+
+  onEvent(aEvent, aData, aCallback) {
+    debug `onEvent: event=${aEvent}, data=${aData}`;
+    this.messageManager.sendAsyncMessage(aEvent, aData);
+  }
+}
diff --git a/mobile/android/modules/geckoview/moz.build b/mobile/android/modules/geckoview/moz.build
index 673a3fae1562..8841c7866aa5 100644
--- a/mobile/android/modules/geckoview/moz.build
+++ b/mobile/android/modules/geckoview/moz.build
@@ -12,6 +12,7 @@ EXTRA_JS_MODULES += [
     'GeckoViewChildModule.jsm',
     'GeckoViewConsole.jsm',
     'GeckoViewContent.jsm',
+    'GeckoViewMedia.jsm',
     'GeckoViewModule.jsm',
     'GeckoViewNavigation.jsm',
     'GeckoViewProgress.jsm',

From 983205d86f8610dd95f6858878803b0fb259c291 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 8 Nov 2018 22:39:30 +0000
Subject: [PATCH 47/77] Bug 1504133 - Make TalosParentProfiler a singleton
 module. r=aswan

Differential Revision: https://phabricator.services.mozilla.com/D11259

--HG--
rename : testing/talos/talos/talos-powers/content/TalosParentProfiler.js => testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
extra : moz-landing-system : lando
---
 .../talos/pageloader/chrome/pageloader.js     |   6 +-
 .../startup_test/sessionrestore/addon/api.js  |   4 +-
 .../content/TalosParentProfiler.js            | 213 -----------------
 .../content/TalosParentProfiler.jsm           | 217 ++++++++++++++++++
 .../talos/tests/cpstartup/extension/api.js    |   8 +-
 .../tests/devtools/addon/content/damp.js      |   1 -
 testing/talos/talos/tests/tabpaint/api.js     |   6 +-
 testing/talos/talos/tests/tabswitch/api.js    |   2 +-
 8 files changed, 225 insertions(+), 232 deletions(-)
 delete mode 100644 testing/talos/talos/talos-powers/content/TalosParentProfiler.js
 create mode 100644 testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm

diff --git a/testing/talos/talos/pageloader/chrome/pageloader.js b/testing/talos/talos/pageloader/chrome/pageloader.js
index 041443cfb321..3c76b921a84f 100644
--- a/testing/talos/talos/pageloader/chrome/pageloader.js
+++ b/testing/talos/talos/pageloader/chrome/pageloader.js
@@ -8,10 +8,8 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
-                                  "resource://talos-powers/TalosParentProfiler.js");
+ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
+                               "resource://talos-powers/TalosParentProfiler.jsm");
 
 var NUM_CYCLES = 5;
 var numPageCycles = 1;
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/api.js b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
index 25cf0a4545ba..79aba15830db 100644
--- a/testing/talos/talos/startup_test/sessionrestore/addon/api.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
@@ -13,11 +13,9 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   StartupPerformance: "resource:///modules/sessionstore/StartupPerformance.jsm",
+  TalosParentProfiler: "resource://talos-powers/TalosParentProfiler.jsm",
 });
 
-XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
-                                  "resource://talos-powers/TalosParentProfiler.js");
-
 /* globals ExtensionAPI */
 
 this.sessionrestore = class extends ExtensionAPI {
diff --git a/testing/talos/talos/talos-powers/content/TalosParentProfiler.js b/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
deleted file mode 100644
index 156687c7120b..000000000000
--- a/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This utility script is for instrumenting your Talos test for
- * performance profiles while running within the parent process.
- * Almost all of the functions that this script exposes to the
- * Gecko Profiler are synchronous, except for finishTest, since that
- * involves requesting the profiles from any content processes and
- * then writing to disk.
- *
- * If your test is running in the content process, you should use
- * TalosContentProfiler.js instead.
- */
-
-var TalosParentProfiler;
-
-(function() {
-  ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-  // Whether or not this TalosContentProfiler object has had initFromObject
-  // or initFromURLQueryParams called on it. Any functions that change the
-  // state of the Gecko Profiler should only be called after calling either
-  // initFromObject or initFromURLQueryParams.
-  let initted = Services.profiler.IsActive();
-
-  // The subtest name that beginTest() was called with.
-  let currentTest = "unknown";
-
-  // Profiler settings.
-  let interval, entries, threadsArray, profileDir;
-
-  // Use a bit of XPCOM hackery to get at the Talos Powers service
-  // implementation...
-  let TalosPowers =
-    Cc["@mozilla.org/talos/talos-powers-service;1"]
-      .getService(Ci.nsISupports)
-      .wrappedJSObject;
-
-  /**
-   * Parses an url query string into a JS object.
-   *
-   * @param locationSearch (string)
-   *        The location string to parse.
-   * @returns Object
-   *        The GET params from the location string as
-   *        key-value pairs in the Object.
-   */
-  function searchToObject(locationSearch) {
-    let pairs = locationSearch.substring(1).split("&");
-    let result = {};
-
-    for (let i in pairs) {
-      if (pairs[i] !== "") {
-        let pair = pairs[i].split("=");
-        result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || "");
-      }
-    }
-
-    return result;
-  }
-
-  TalosParentProfiler = {
-    /**
-     * Initialize the profiler using profiler settings supplied in a JS object.
-     *
-     * @param obj (object)
-     *   The following properties on the object are respected:
-     *     gecko_profile_interval (int)
-     *     gecko_profile_entries (int)
-     *     gecko_profile_threads (string, comma separated list of threads to filter with)
-     *     gecko_profile_dir (string)
-     */
-    initFromObject(obj = {}) {
-      if (!initted) {
-        if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
-            ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
-            ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
-            ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
-          interval = obj.gecko_profile_interval;
-          entries = obj.gecko_profile_entries;
-          threadsArray = obj.gecko_profile_threads.split(",");
-          profileDir = obj.gecko_profile_dir;
-          initted = true;
-        } else {
-          console.error("Profiler could not init with object: " + JSON.stringify(obj));
-        }
-      }
-    },
-
-    /**
-     * Initialize the profiler using a string from a location string.
-     *
-     * @param locationSearch (string)
-     *        The location string to initialize with.
-     */
-    initFromURLQueryParams(locationSearch) {
-      this.initFromObject(searchToObject(locationSearch));
-    },
-
-    /**
-     * A Talos test is about to start. Note that the Gecko Profiler will be
-     * paused immediately after starting and that resume() should be called
-     * in order to collect samples.
-     *
-     * @param testName (string)
-     *        The name of the test to use in Profiler markers.
-     */
-    beginTest(testName) {
-      if (initted) {
-        currentTest = testName;
-        TalosPowers.profilerBegin({ entries, interval, threadsArray });
-      } else {
-        let msg = "You should not call beginTest without having first " +
-                  "initted the Profiler";
-        console.error(msg);
-      }
-    },
-
-    /**
-     * A Talos test has finished. This will stop the Gecko Profiler from
-     * sampling, and return a Promise that resolves once the Profiler has
-     * finished dumping the multi-process profile to disk.
-     *
-     * @returns Promise
-     *          Resolves once the profile has been dumped to disk. The test should
-     *          not try to quit the browser until this has resolved.
-     */
-    finishTest() {
-      if (initted) {
-        let profileFile = profileDir + "/" + currentTest + ".profile";
-        return TalosPowers.profilerFinish(profileFile);
-      }
-        let msg = "You should not call finishTest without having first " +
-                  "initted the Profiler";
-        console.error(msg);
-        return Promise.reject(msg);
-
-    },
-
-    /**
-     * A start-up test has finished. Callers don't need to run beginTest or
-     * finishTest, but should pause the sampler as soon as possible, and call
-     * this function to dump the profile.
-     *
-     * @returns Promise
-     *          Resolves once the profile has been dumped to disk. The test should
-     *          not try to quit the browser until this has resolved.
-     */
-    finishStartupProfiling() {
-      if (initted) {
-        let profileFile = profileDir + "/startup.profile";
-        return TalosPowers.profilerFinish(profileFile);
-      }
-      return Promise.resolve();
-    },
-
-    /**
-     * Resumes the Gecko Profiler sampler. Can also simultaneously set a marker.
-     *
-     * @returns Promise
-     *          Resolves once the Gecko Profiler has resumed.
-     */
-    resume(marker = "") {
-      if (initted) {
-        TalosPowers.profilerResume(marker);
-      }
-    },
-
-    /**
-     * Pauses the Gecko Profiler sampler. Can also simultaneously set a marker.
-     *
-     * @returns Promise
-     *          Resolves once the Gecko Profiler has paused.
-     */
-    pause(marker = "") {
-      if (initted) {
-        TalosPowers.profilerPause(marker);
-      }
-    },
-
-    /**
-     * Adds a marker to the profile.
-     *
-     * @returns Promise
-     *          Resolves once the marker has been set.
-     */
-    mark(marker) {
-      if (initted) {
-        // If marker is omitted, just use the test name
-        if (!marker) {
-          marker = currentTest;
-        }
-
-        TalosPowers.profilerMarker(marker);
-      }
-    },
-
-    afterProfileGathered() {
-      if (!initted) {
-        return Promise.resolve();
-      }
-
-      return new Promise(resolve => {
-        Services.obs.addObserver(function onGathered() {
-          Services.obs.removeObserver(onGathered, "talos-profile-gathered");
-          resolve();
-        }, "talos-profile-gathered");
-      });
-    },
-  };
-})();
diff --git a/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm b/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
new file mode 100644
index 000000000000..a237c0fe54bb
--- /dev/null
+++ b/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
@@ -0,0 +1,217 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * This module is for instrumenting your Talos test for
+ * performance profiles while running within the parent process.
+ * Almost all of the functions that this script exposes to the
+ * Gecko Profiler are synchronous, except for finishTest, since that
+ * involves requesting the profiles from any content processes and
+ * then writing to disk.
+ *
+ * If your test is running in the content process, you should use the
+ * TalosContentProfiler.js utility script instead.
+ */
+
+var EXPORTED_SYMBOLS = ["TalosParentProfiler"];
+
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+const TalosParentProfiler = {
+  // Whether or not this TalosContentProfiler object has had initFromObject
+  // or initFromURLQueryParams called on it. Any functions that change the
+  // state of the Gecko Profiler should only be called after calling either
+  // initFromObject or initFromURLQueryParams.
+  initted: false,
+  // The subtest name that beginTest() was called with.
+  currentTest: "unknown",
+  // Profiler settings.
+  interval: undefined,
+  entries: undefined,
+  threadsArray: undefined,
+  profileDir: undefined,
+
+  get TalosPowers() {
+    // Use a bit of XPCOM hackery to get at the Talos Powers service
+    // implementation...
+    return Cc["@mozilla.org/talos/talos-powers-service;1"]
+             .getService(Ci.nsISupports)
+             .wrappedJSObject;
+  },
+
+  /**
+   * Initialize the profiler using profiler settings supplied in a JS object.
+   *
+   * @param obj (object)
+   *   The following properties on the object are respected:
+   *     gecko_profile_interval (int)
+   *     gecko_profile_entries (int)
+   *     gecko_profile_threads (string, comma separated list of threads to filter with)
+   *     gecko_profile_dir (string)
+   */
+  initFromObject(obj = {}) {
+    if (!this.initted) {
+      if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+        this.interval = obj.gecko_profile_interval;
+        this.entries = obj.gecko_profile_entries;
+        this.threadsArray = obj.gecko_profile_threads.split(",");
+        this.profileDir = obj.gecko_profile_dir;
+        this.initted = true;
+      } else {
+        console.error("Profiler could not init with object: " + JSON.stringify(obj));
+      }
+    }
+  },
+
+  /**
+   * Initialize the profiler using a string from a location string.
+   *
+   * @param locationSearch (string)
+   *        The location string to initialize with.
+   */
+  initFromURLQueryParams(locationSearch) {
+    this.initFromObject(this.searchToObject(locationSearch));
+  },
+
+  /**
+   * Parses an url query string into a JS object.
+   *
+   * @param locationSearch (string)
+   *        The location string to parse.
+   * @returns Object
+   *        The GET params from the location string as
+   *        key-value pairs in the Object.
+   */
+  searchToObject(locationSearch) {
+    let pairs = locationSearch.substring(1).split("&");
+    let result = {};
+
+    for (let i in pairs) {
+      if (pairs[i] !== "") {
+        let pair = pairs[i].split("=");
+        result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || "");
+      }
+    }
+
+    return result;
+  },
+
+  /**
+   * A Talos test is about to start. Note that the Gecko Profiler will be
+   * paused immediately after starting and that resume() should be called
+   * in order to collect samples.
+   *
+   * @param testName (string)
+   *        The name of the test to use in Profiler markers.
+   */
+  beginTest(testName) {
+    if (this.initted) {
+      this.currentTest = testName;
+      this.TalosPowers.profilerBegin({
+        entries: this.entries,
+        interval: this.interval,
+        threadsArray: this.threadsArray,
+      });
+    } else {
+      let msg = "You should not call beginTest without having first " +
+                "initted the Profiler";
+      console.error(msg);
+    }
+  },
+
+  /**
+   * A Talos test has finished. This will stop the Gecko Profiler from
+   * sampling, and return a Promise that resolves once the Profiler has
+   * finished dumping the multi-process profile to disk.
+   *
+   * @returns Promise
+   *          Resolves once the profile has been dumped to disk. The test should
+   *          not try to quit the browser until this has resolved.
+   */
+  finishTest() {
+    if (this.initted) {
+      let profileFile = this.profileDir + "/" + this.currentTest + ".profile";
+      return this.TalosPowers.profilerFinish(profileFile);
+    }
+      let msg = "You should not call finishTest without having first " +
+                "initted the Profiler";
+      console.error(msg);
+      return Promise.reject(msg);
+
+  },
+
+  /**
+   * A start-up test has finished. Callers don't need to run beginTest or
+   * finishTest, but should pause the sampler as soon as possible, and call
+   * this function to dump the profile.
+   *
+   * @returns Promise
+   *          Resolves once the profile has been dumped to disk. The test should
+   *          not try to quit the browser until this has resolved.
+   */
+  finishStartupProfiling() {
+    if (this.initted) {
+      let profileFile = this.profileDir + "/startup.profile";
+      return this.TalosPowers.profilerFinish(profileFile);
+    }
+    return Promise.resolve();
+  },
+
+  /**
+   * Resumes the Gecko Profiler sampler. Can also simultaneously set a marker.
+   *
+   * @returns Promise
+   *          Resolves once the Gecko Profiler has resumed.
+   */
+  resume(marker = "") {
+    if (this.initted) {
+      this.TalosPowers.profilerResume(marker);
+    }
+  },
+
+  /**
+   * Pauses the Gecko Profiler sampler. Can also simultaneously set a marker.
+   *
+   * @returns Promise
+   *          Resolves once the Gecko Profiler has paused.
+   */
+  pause(marker = "") {
+    if (this.initted) {
+      this.TalosPowers.profilerPause(marker);
+    }
+  },
+
+  /**
+   * Adds a marker to the profile.
+   *
+   * @returns Promise
+   *          Resolves once the marker has been set.
+   */
+  mark(marker) {
+    if (this.initted) {
+      // If marker is omitted, just use the test name
+      if (!marker) {
+        marker = this.currentTest;
+      }
+
+      this.TalosPowers.profilerMarker(marker);
+    }
+  },
+
+  afterProfileGathered() {
+    if (!this.initted) {
+      return Promise.resolve();
+    }
+
+    return new Promise(resolve => {
+      Services.obs.addObserver(function onGathered() {
+        Services.obs.removeObserver(onGathered, "talos-profile-gathered");
+        resolve();
+      }, "talos-profile-gathered");
+    });
+  },
+};
diff --git a/testing/talos/talos/tests/cpstartup/extension/api.js b/testing/talos/talos/tests/cpstartup/extension/api.js
index aec982092e17..c206cd671d14 100644
--- a/testing/talos/talos/tests/cpstartup/extension/api.js
+++ b/testing/talos/talos/tests/cpstartup/extension/api.js
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-
 /**
  * The purpose of this test it to measure the performance of a
  * content process startup.
@@ -18,9 +15,8 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
  * the content side, just the overhead of spawning a new content process.
  */
 
-XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
-                                  "resource://talos-powers/TalosParentProfiler.js");
-
+ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
+                                  "resource://talos-powers/TalosParentProfiler.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 
diff --git a/testing/talos/talos/tests/devtools/addon/content/damp.js b/testing/talos/talos/tests/devtools/addon/content/damp.js
index e938cf265f76..d610c152c576 100644
--- a/testing/talos/talos/tests/devtools/addon/content/damp.js
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.js
@@ -3,7 +3,6 @@ const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm
 const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
 const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
 let scope = {};
-Services.scriptloader.loadSubScript("resource://talos-powers/TalosParentProfiler.js", scope);
 const { TalosParentProfiler } = scope;
 
 XPCOMUtils.defineLazyGetter(this, "require", function() {
diff --git a/testing/talos/talos/tests/tabpaint/api.js b/testing/talos/talos/tests/tabpaint/api.js
index 92aee03bcc14..443040f2eee3 100644
--- a/testing/talos/talos/tests/tabpaint/api.js
+++ b/testing/talos/talos/tests/tabpaint/api.js
@@ -20,12 +20,10 @@
  *    for certain types of links (_blank links for example) to open new tabs.
  */
 
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
-                                  "resource://talos-powers/TalosParentProfiler.js");
+ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
+                               "resource://talos-powers/TalosParentProfiler.jsm");
 
 const ANIMATION_PREF = "toolkit.cosmeticAnimations.enabled";
 const MULTI_OPT_OUT_PREF = "dom.ipc.multiOptOut";
diff --git a/testing/talos/talos/tests/tabswitch/api.js b/testing/talos/talos/tests/tabswitch/api.js
index ef52b8bb8cbc..d490b3b19e78 100644
--- a/testing/talos/talos/tests/tabswitch/api.js
+++ b/testing/talos/talos/tests/tabswitch/api.js
@@ -190,7 +190,7 @@ async function test(window) {
     return;
   }
 
-  Services.scriptloader.loadSubScript("resource://talos-powers/TalosParentProfiler.js", context);
+  ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm", context);
   TalosParentProfiler = context.TalosParentProfiler;
 
   let testURLs = [];

From 2bf5e3d8381fd0a3eed7dbbbeb69016918369512 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 8 Nov 2018 22:39:37 +0000
Subject: [PATCH 48/77] Bug 1504133 - Make sure sessionrestore tests initialize
 the TalosParentProfiler. r=aswan

Depends on D11259

Differential Revision: https://phabricator.services.mozilla.com/D11260

--HG--
extra : moz-landing-system : lando
---
 .../startup_test/sessionrestore/addon/api.js     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/api.js b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
index 79aba15830db..f66a9f6f57f8 100644
--- a/testing/talos/talos/startup_test/sessionrestore/addon/api.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
@@ -9,6 +9,7 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
+  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   Services: "resource://gre/modules/Services.jsm",
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
@@ -45,6 +46,21 @@ this.sessionrestore = class extends ExtensionAPI {
             async function observe() {
               Services.obs.removeObserver(observe, StartupPerformance.RESTORED_TOPIC);
 
+              let win = BrowserWindowTracker.getTopWindow();
+              let args = win.arguments[0];
+              if (args && args instanceof Ci.nsIArray) {
+                // For start-up tests Gecko Profiler arguments are passed to the first URL in
+                // the query string, with the presumption that some tab that is loaded at start-up
+                // will want to use them in the TalosContentProfiler.js script.
+                //
+                // Because we're running this part of the test in the parent process, we
+                // pull those arguments from the top window directly. This is mainly so
+                // that TalosParentProfiler knows where to save the profile.
+                Cu.importGlobalProperties(["URL"]);
+                let url = new URL(args.queryElementAt(0, Ci.nsISupportsString).data);
+                TalosParentProfiler.initFromURLQueryParams(url.search);
+              }
+
               await TalosParentProfiler.pause("This test measures the time between sessionRestoreInit and sessionRestored, ignore everything around that");
               await TalosParentProfiler.finishStartupProfiling();
 

From 8d0d153a1ee131aaa17b571264c51bd785b26626 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 8 Nov 2018 22:39:41 +0000
Subject: [PATCH 49/77] Bug 1504133 - Remove dead code from sessionrestore
 Talos test. r=aswan

Depends on D11260

Differential Revision: https://phabricator.services.mozilla.com/D11261

--HG--
extra : moz-landing-system : lando
---
 .../sessionrestore/addon/content/index.html   | 21 ----------
 .../sessionrestore/addon/content/main.js      | 40 -------------------
 2 files changed, 61 deletions(-)
 delete mode 100755 testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
 delete mode 100755 testing/talos/talos/startup_test/sessionrestore/addon/content/main.js

diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html b/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
deleted file mode 100755
index ed0a9a8a595a..000000000000
--- a/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-
-<meta charset="UTF-8"/>
-<title>Session Restore Regression Test</title>
-
-<script type="text/javascript" src="chrome://pageloader/content/MozillaFileLogger.js"></script>
-<script type="text/javascript" src="resource://talos-powers/TalosContentProfiler.js"></script>
-<script type="text/javascript" src="resource://talos-powers/TalosPowersContent.js"></script>
-<script type="text/javascript" src="chrome://session-restore-test/content/main.js">
-</script>
-
-<div>
-  <strong>Time between sessionRestoreInit and sessionRestored</strong>
-  <span id="sessionRestoreInit-to-sessionRestored">
-  (in progress)
-  </span>
-</div>
-
-</body>
-</html>
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js b/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js
deleted file mode 100755
index c41799233c5c..000000000000
--- a/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js
+++ /dev/null
@@ -1,40 +0,0 @@
-"use strict";
-
-var Services = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services;
-
-// Process Message Manager topics.
-const MSG_REQUEST = "session-restore-test?duration";
-const MSG_PROVIDE = "session-restore-test:duration";
-
-addEventListener("load", function() {
-  Services.cpmm.addMessageListener(MSG_PROVIDE,
-    /**
-     * Display the result, send it to the harness and quit.
-     */
-    async function finish(msg) {
-      console.log(`main.js: received data on ${MSG_PROVIDE}`, msg);
-      Services.cpmm.removeMessageListener(MSG_PROVIDE, finish);
-      var duration = msg.data.duration;
-      TalosContentProfiler.initFromURLQueryParams(location.search);
-      await TalosContentProfiler.pause("This test measures the time between sessionRestoreInit and sessionRestored, ignore everything around that");
-      await TalosContentProfiler.finishStartupProfiling();
-
-      // Show result on screen. Nice but not really necessary.
-      document.getElementById("sessionRestoreInit-to-sessionRestored").textContent = duration + "ms";
-
-      // Report data to Talos, if possible
-      dumpLog("__start_report" +
-              duration +
-              "__end_report\n\n");
-
-      // Next one is required by the test harness but not used
-      dumpLog("__startTimestamp" +
-              Date.now() + // eslint-disable-line mozilla/avoid-Date-timing
-              "__endTimestamp\n\n");
-      TalosPowersContent.goQuitApplication();
-  });
-
-  // In case the add-on has broadcasted the message before we were loaded,
-  // request a second broadcast.
-  Services.cpmm.sendAsyncMessage(MSG_REQUEST, {});
-});

From 52a6075675e2907d4386122ef5f9ca7131ab7ab2 Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Thu, 8 Nov 2018 22:39:59 +0000
Subject: [PATCH 50/77] Bug 1504133 - Make pageloader tests wait for
 TalosPowers to become available before starting. r=aswan

Depends on D11261

Differential Revision: https://phabricator.services.mozilla.com/D11262

--HG--
extra : moz-landing-system : lando
---
 testing/talos/talos/pageloader/api.js         | 21 +++++++++++++++++--
 .../tests/devtools/addon/content/damp.js      |  3 +--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/testing/talos/talos/pageloader/api.js b/testing/talos/talos/pageloader/api.js
index 531ca099ac12..2c18de193636 100644
--- a/testing/talos/talos/pageloader/api.js
+++ b/testing/talos/talos/pageloader/api.js
@@ -39,6 +39,7 @@
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
                                    "@mozilla.org/addons/addon-manager-startup;1",
@@ -93,9 +94,25 @@ this.pageloader = class extends ExtensionAPI {
     ]);
 
     if (env.exists("MOZ_USE_PAGELOADER")) {
-      // This is async but we're delibeately not await-ing or return-ing
+      // TalosPowers is a separate WebExtension that may or may not already have
+      // finished loading. tryLoad is used to wait for TalosPowers to be around
+      // before continuing.
+      async function tryLoad() {
+        try {
+          ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm");
+        } catch (err) {
+          await new Promise(resolve => setTimeout(resolve, 500));
+          return tryLoad();
+        }
+
+        return null;
+      }
+
+      // talosStart is async but we're deliberately not await-ing or return-ing
       // it here since it doesn't block extension startup.
-      talosStart();
+      tryLoad().then(() => {
+        talosStart();
+      });
     }
   }
 
diff --git a/testing/talos/talos/tests/devtools/addon/content/damp.js b/testing/talos/talos/tests/devtools/addon/content/damp.js
index d610c152c576..831a531b1139 100644
--- a/testing/talos/talos/tests/devtools/addon/content/damp.js
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.js
@@ -1,9 +1,8 @@
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
 const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
+const { TalosParentProfiler } = ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm", {});
 const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
-let scope = {};
-const { TalosParentProfiler } = scope;
 
 XPCOMUtils.defineLazyGetter(this, "require", function() {
   let { require } =

From a2c57d181c30c8e2bcff06e20ca0d1b612ec9619 Mon Sep 17 00:00:00 2001
From: Marco Bonardo <mbonardo@mozilla.com>
Date: Thu, 8 Nov 2018 22:26:49 +0000
Subject: [PATCH 51/77] Bug 1502394 - Quantum bar support for
 browser.urlbar.filter.javascript. r=adw

Differential Revision: https://phabricator.services.mozilla.com/D11246

--HG--
extra : moz-landing-system : lando
---
 .../urlbar/UrlbarProvidersManager.jsm         |  8 ++++
 .../unit/test_providersManager_filtering.js   | 42 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/browser/components/urlbar/UrlbarProvidersManager.jsm b/browser/components/urlbar/UrlbarProvidersManager.jsm
index 952813649e20..b6dd3af3876b 100644
--- a/browser/components/urlbar/UrlbarProvidersManager.jsm
+++ b/browser/components/urlbar/UrlbarProvidersManager.jsm
@@ -252,6 +252,14 @@ class Query {
       return;
     }
 
+    // Filter out javascript results for safety. The provider is supposed to do
+    // it, but we don't want to risk leaking these out.
+    if (match.url.startsWith("javascript:") &&
+        !this.context.searchString.startsWith("javascript:") &&
+        UrlbarPrefs.get("filter.javascript")) {
+      return;
+    }
+
     this.context.results.push(match);
 
     let notifyResults = () => {
diff --git a/browser/components/urlbar/tests/unit/test_providersManager_filtering.js b/browser/components/urlbar/tests/unit/test_providersManager_filtering.js
index 08891d00d2e0..c94df5f1d739 100644
--- a/browser/components/urlbar/tests/unit/test_providersManager_filtering.js
+++ b/browser/components/urlbar/tests/unit/test_providersManager_filtering.js
@@ -3,7 +3,7 @@
 
 "use strict";
 
-add_task(async function test_providers() {
+add_task(async function test_filtering() {
   let match = new UrlbarMatch(UrlbarUtils.MATCH_TYPE.TAB_SWITCH,
                               UrlbarUtils.MATCH_SOURCE.TABS,
                               { url: "http://mozilla.org/foo/" });
@@ -57,3 +57,43 @@ add_task(async function test_providers() {
   await promise;
   Assert.deepEqual(context.results, [match]);
 });
+
+add_task(async function test_filter_javascript() {
+  let context = createContext();
+  let controller = new UrlbarController({
+    browserWindow: {
+      location: {
+        href: AppConstants.BROWSER_CHROME_URL,
+      },
+    },
+  });
+  let match = new UrlbarMatch(UrlbarUtils.MATCH_TYPE.TAB_SWITCH,
+                              UrlbarUtils.MATCH_SOURCE.TABS,
+                              { url: "http://mozilla.org/foo/" });
+  let jsMatch = new UrlbarMatch(UrlbarUtils.MATCH_TYPE.TAB_SWITCH,
+                                UrlbarUtils.MATCH_SOURCE.HISTORY,
+                                { url: "javascript:foo" });
+  registerBasicTestProvider([match, jsMatch]);
+
+  info("By default javascript should be filtered out");
+  let promise = promiseControllerNotification(controller, "onQueryResults");
+  await controller.startQuery(context, controller);
+  await promise;
+  Assert.deepEqual(context.results, [match]);
+
+  info("Except when the user explicitly starts the search with javascript:");
+  context = createContext(`javascript: ${UrlbarTokenizer.RESTRICT.HISTORY}`);
+  promise = promiseControllerNotification(controller, "onQueryResults");
+  await controller.startQuery(context, controller);
+  await promise;
+  Assert.deepEqual(context.results, [jsMatch]);
+
+  info("Disable javascript filtering");
+  Services.prefs.setBoolPref("browser.urlbar.filter.javascript", false);
+  context = createContext();
+  promise = promiseControllerNotification(controller, "onQueryResults");
+  await controller.startQuery(context, controller);
+  await promise;
+  Assert.deepEqual(context.results, [match, jsMatch]);
+  Services.prefs.clearUserPref("browser.urlbar.filter.javascript");
+});

From aa78b6d05a7a3e32c65eab2bf9f5127335d58953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 21:37:16 +0000
Subject: [PATCH 52/77] Bug 1505817 - Handle the case where a float is
 dynamically inserted inside a continuation. r=dbaron

The first assertion that fails here, and which causes all the havoc later, is:

  https://dev.searchfox.org/mozilla-central/rev/6e0e603f4852b8e571e5b8ae133e772b18b6016e/layout/generic/BlockReflowInput.cpp#578

That happens because the float has been dynamically inserted directly under one
of the continuations of the column set, not under the first. So that assertion
doesn't really hold.

Properly steal the float if that happens.

Differential Revision: https://phabricator.services.mozilla.com/D11359

--HG--
extra : moz-landing-system : lando
---
 layout/generic/BlockReflowInput.cpp       | 14 ++++++------
 layout/generic/crashtests/1505817.html    | 27 +++++++++++++++++++++++
 layout/generic/crashtests/crashtests.list |  1 +
 3 files changed, 35 insertions(+), 7 deletions(-)
 create mode 100644 layout/generic/crashtests/1505817.html

diff --git a/layout/generic/BlockReflowInput.cpp b/layout/generic/BlockReflowInput.cpp
index 4e271abd842d..d32511efaffe 100644
--- a/layout/generic/BlockReflowInput.cpp
+++ b/layout/generic/BlockReflowInput.cpp
@@ -575,11 +575,12 @@ BlockReflowInput::AddFloat(nsLineLayout*       aLineLayout,
   MOZ_ASSERT(aFloat->GetParent(), "float must have parent");
   MOZ_ASSERT(aFloat->GetParent()->IsFrameOfType(nsIFrame::eBlockFrame),
              "float's parent must be block");
-  MOZ_ASSERT(aFloat->GetParent() == mBlock ||
-             (aFloat->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT),
-             "float should be in this block unless it was marked as "
-             "pushed float");
-  if (aFloat->GetStateBits() & NS_FRAME_IS_PUSHED_FLOAT) {
+  if (aFloat->HasAnyStateBits(NS_FRAME_IS_PUSHED_FLOAT) ||
+      aFloat->GetParent() != mBlock) {
+    MOZ_ASSERT(aFloat->HasAnyStateBits(NS_FRAME_IS_PUSHED_FLOAT | NS_FRAME_FIRST_REFLOW),
+               "float should be in this block unless it was marked as "
+               "pushed float, or just inserted");
+    MOZ_ASSERT(aFloat->GetParent()->FirstContinuation() == mBlock->FirstContinuation());
     // If, in a previous reflow, the float was pushed entirely to
     // another column/page, we need to steal it back.  (We might just
     // push it again, though.)  Likewise, if that previous reflow
@@ -588,8 +589,7 @@ BlockReflowInput::AddFloat(nsLineLayout*       aLineLayout,
     //
     // For more about pushed floats, see the comment above
     // nsBlockFrame::DrainPushedFloats.
-    nsBlockFrame *floatParent =
-      static_cast<nsBlockFrame*>(aFloat->GetParent());
+    auto* floatParent = static_cast<nsBlockFrame*>(aFloat->GetParent());
     floatParent->StealFrame(aFloat);
 
     aFloat->RemoveStateBits(NS_FRAME_IS_PUSHED_FLOAT);
diff --git a/layout/generic/crashtests/1505817.html b/layout/generic/crashtests/1505817.html
new file mode 100644
index 000000000000..185a2105148b
--- /dev/null
+++ b/layout/generic/crashtests/1505817.html
@@ -0,0 +1,27 @@
+<style>
+  html {
+    word-spacing: calc(-47em + 255px);
+  }
+
+  * {
+    float: left;
+    column-count: 14;
+  }
+
+  *::first-letter {
+    -moz-margin-start: calc(25px*3);
+  }
+</style>
+<script>
+  function start() {
+    o1 = document.createElement('c')
+    audio = document.getElementById('audio_0')
+    audio.insertAdjacentText('beforebegin', 'Ù\n-†­ð†3ê')
+    audio.getClientRects()
+    audio.insertAdjacentElement('beforebegin', o1)
+    audio.getClientRects()
+  }
+
+  window.addEventListener('load', start)
+</script>
+<audio id="audio_0" muted>
diff --git a/layout/generic/crashtests/crashtests.list b/layout/generic/crashtests/crashtests.list
index 085876f07fee..51af50214054 100644
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -717,3 +717,4 @@ load 1493708.html
 load 1493710.html
 load 1493741.html
 load 1494380.html
+load 1505817.html

From 329de1ce5e266cd4260338725825381b108aa2d6 Mon Sep 17 00:00:00 2001
From: "J.C. Jones" <jjones@mozilla.com>
Date: Thu, 8 Nov 2018 21:40:53 +0000
Subject: [PATCH 53/77] Bug 1505930 - Promote try-push analysis result r=catlee

"It's the best!" used to be front-and-center on try push email notifications,
within the content area of the automated happiness-intensifier email.

Bug 1490515 regressed the happiness to the far-right side of the subject line.
In keeping with "It's the best!" deserving a top-level treatment, it should be
duplicated (by value) in the message body.

Differential Revision: https://phabricator.services.mozilla.com/D11374

--HG--
extra : moz-landing-system : lando
---
 .taskcluster.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 4e412cae6d47..615749cb85c1 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -246,7 +246,7 @@ tasks:
                 notify:
                   email:
                     subject: "Thank you for your try submission of ${push.revision}. It's the best!"
-                    content: "Your try push has been submitted. Use the link to view the status of your jobs."
+                    content: "Your try push has been submitted. It's the best! Use the link to view the status of your jobs."
                     link:
                       text: "Treeherder Jobs"
                       href: "https://treeherder.mozilla.org/#/jobs?repo=${repository.project}&revision=${push.revision}"

From b801ff16e01f668acbdf6b348d4b242b101ebe4c Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 8 Nov 2018 03:46:07 +0000
Subject: [PATCH 54/77] Bug 1471535 - pt2 - Fix lurking OSX and Win build
 issues prepping for RDD work. r=jya

Due to changes in where things end up in the unified builds.

Depends on D8482

Differential Revision: https://phabricator.services.mozilla.com/D8483

--HG--
extra : moz-landing-system : lando
---
 dom/media/platforms/apple/AppleVTDecoder.cpp | 3 ++-
 gfx/ipc/VsyncBridgeParent.cpp                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dom/media/platforms/apple/AppleVTDecoder.cpp b/dom/media/platforms/apple/AppleVTDecoder.cpp
index e7cc4765025b..0fcbfe0bceee 100644
--- a/dom/media/platforms/apple/AppleVTDecoder.cpp
+++ b/dom/media/platforms/apple/AppleVTDecoder.cpp
@@ -11,6 +11,7 @@
 #include "AppleDecoderModule.h"
 #include "AppleUtils.h"
 #include "AppleVTLinker.h"
+#include "MacIOSurfaceImage.h"
 #include "MediaData.h"
 #include "mozilla/ArrayUtils.h"
 #include "H264.h"
@@ -436,7 +437,7 @@ AppleVTDecoder::OutputFrame(CVPixelBufferRef aImage,
 
     RefPtr<MacIOSurface> macSurface = new MacIOSurface(surface);
 
-    RefPtr<layers::Image> image = new MacIOSurfaceImage(macSurface);
+    RefPtr<layers::Image> image = new layers::MacIOSurfaceImage(macSurface);
 
     data =
       VideoData::CreateFromImage(info.mDisplay,
diff --git a/gfx/ipc/VsyncBridgeParent.cpp b/gfx/ipc/VsyncBridgeParent.cpp
index 969d9ff7d1a7..59ad70417b03 100644
--- a/gfx/ipc/VsyncBridgeParent.cpp
+++ b/gfx/ipc/VsyncBridgeParent.cpp
@@ -4,8 +4,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "VsyncBridgeParent.h"
+#include "mozilla/layers/CompositorBridgeParent.h"
 #include "mozilla/layers/CompositorThread.h"
 
+using mozilla::layers::CompositorBridgeParent;
+using mozilla::layers::CompositorThreadHolder;
+
 namespace mozilla {
 namespace gfx {
 

From 74b9fe1251dac923bebc43025a0b42501657abe7 Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Thu, 8 Nov 2018 21:58:04 +0000
Subject: [PATCH 55/77] Bug 1499193 - Follow-up: Update metadata for the
 SEARCH_COUNTS keyed histogram. r=mkaply

Differential Revision: https://phabricator.services.mozilla.com/D11382

--HG--
extra : moz-landing-system : lando
---
 toolkit/components/telemetry/Histograms.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 57cd111089bc..d0d2ab7d1330 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -7998,7 +7998,9 @@
     "kind": "count",
     "keyed": true,
     "releaseChannelCollection": "opt-out",
-    "description": "Records search counts for search access points and in content searches. For search access points, the format is: <engine-name>.<search-access-point> For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
+    "description": "Records search counts for search access points and in content searches. For search access points in general and for the urlbar when an internal @engine shorcut is not used, the format is: <engine-name>.<search-access-point> For the urlbar when an internal @engine shortcut is used, the format is: <engine-name>.<@engine>.urlbar For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
+    "alert_emails": ["adw@mozilla.com"],
+    "bug_numbers": [1089670, 1482158, 1499193],
   },
   "SEARCH_RESET_RESULT": {
     "record_in_processes": ["main", "content"],

From 34f2da68a8c74b4ff35427b4d8c7d6c92c25d9b5 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Fri, 9 Nov 2018 00:57:05 +0200
Subject: [PATCH 56/77] Backed out changeset d96cbd9059cd (bug 1495749) for
 browser_policy_extensions.js failures. CLOSED TREE

--HG--
rename : browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi => browser/components/enterprisepolicies/tests/browser/policytest.xpi
---
 .../enterprisepolicies/Policies.jsm           |  48 +++++++-----------
 .../tests/browser/browser.ini                 |   3 +-
 .../browser/browser_policy_extensions.js      |  37 +-------------
 .../{policytest_v0.1.xpi => policytest.xpi}   | Bin
 .../tests/browser/policytest_v0.2.xpi         |   0
 5 files changed, 21 insertions(+), 67 deletions(-)
 rename browser/components/enterprisepolicies/tests/browser/{policytest_v0.1.xpi => policytest.xpi} (100%)
 delete mode 100644 browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
index 4435fcbb1117..9531a7366639 100644
--- a/browser/components/enterprisepolicies/Policies.jsm
+++ b/browser/components/enterprisepolicies/Policies.jsm
@@ -491,28 +491,8 @@ var Policies = {
 
   "Extensions": {
     onBeforeUIStartup(manager, param) {
-      let uninstallingPromise = Promise.resolve();
-      if ("Uninstall" in param) {
-        uninstallingPromise = runOncePerModification("extensionsUninstall", JSON.stringify(param.Uninstall), async () => {
-          // If we're uninstalling add-ons, re-run the extensionsInstall runOnce even if it hasn't
-          // changed, which will allow add-ons to be updated.
-          Services.prefs.clearUserPref("browser.policies.runOncePerModification.extensionsInstall");
-          let addons = await AddonManager.getAddonsByIDs(param.Uninstall);
-          for (let addon of addons) {
-            if (addon) {
-              try {
-                await addon.uninstall();
-              } catch (e) {
-                // This can fail for add-ons that can't be uninstalled.
-                // Just ignore.
-              }
-            }
-          }
-        });
-      }
       if ("Install" in param) {
-        runOncePerModification("extensionsInstall", JSON.stringify(param.Install), async () => {
-          await uninstallingPromise;
+        runOncePerModification("extensionsInstall", JSON.stringify(param.Install), () => {
           for (let location of param.Install) {
             let url;
             if (location.includes("://")) {
@@ -564,6 +544,21 @@ var Policies = {
           }
         });
       }
+      if ("Uninstall" in param) {
+        runOncePerModification("extensionsUninstall", JSON.stringify(param.Uninstall), async () => {
+          let addons = await AddonManager.getAddonsByIDs(param.Uninstall);
+          for (let addon of addons) {
+            if (addon) {
+              try {
+                addon.uninstall();
+              } catch (e) {
+                // This can fail for add-ons that can't be uninstalled.
+                // Just ignore.
+              }
+            }
+          }
+        });
+      }
       if ("Locked" in param) {
         for (let ID of param.Locked) {
           manager.disallowFeature(`modify-extension:${ID}`);
@@ -1051,8 +1046,6 @@ function runOnce(actionName, callback) {
  * callback once when the policy is set, then never again.
  * runOncePerModification runs the callback once each time the policy value
  * changes from its previous value.
- * If the callback that was passed is an async function, you can await on this
- * function to await for the callback.
  *
  * @param {string} actionName
  *        A given name which will be used to track if this callback has run.
@@ -1064,19 +1057,16 @@ function runOnce(actionName, callback) {
  *        string.
  * @param {Function} callback
  *        The callback to be run when the pref value changes
- * @returns Promise
- *        A promise that will resolve once the callback finishes running.
- *
  */
-async function runOncePerModification(actionName, policyValue, callback) {
+function runOncePerModification(actionName, policyValue, callback) {
   let prefName = `browser.policies.runOncePerModification.${actionName}`;
   let oldPolicyValue = Services.prefs.getStringPref(prefName, undefined);
   if (policyValue === oldPolicyValue) {
     log.debug(`Not running action ${actionName} again because the policy's value is unchanged`);
-    return Promise.resolve();
+    return;
   }
   Services.prefs.setStringPref(prefName, policyValue);
-  return callback();
+  callback();
 }
 
 let gChromeURLSBlocked = false;
diff --git a/browser/components/enterprisepolicies/tests/browser/browser.ini b/browser/components/enterprisepolicies/tests/browser/browser.ini
index 5bdbd555fe2c..91a4f7c91da1 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser.ini
+++ b/browser/components/enterprisepolicies/tests/browser/browser.ini
@@ -5,8 +5,7 @@ support-files =
   config_broken_json.json
   opensearch.html
   opensearchEngine.xml
-  policytest_v0.1.xpi
-  policytest_v0.2.xpi
+  policytest.xpi
   policy_websitefilter_block.html
   policy_websitefilter_exception.html
   ../../../../../toolkit/components/antitracking/test/browser/page.html
diff --git a/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js b/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
index 8f351b46b46d..64fb096bb55f 100644
--- a/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
+++ b/browser/components/enterprisepolicies/tests/browser/browser_policy_extensions.js
@@ -3,7 +3,6 @@
 "use strict";
 
 const addonID = "policytest@mozilla.com";
-const BASE_URL = "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser";
 
 add_task(async function test_addon_install() {
   let installPromise = wait_for_addon_install();
@@ -11,7 +10,7 @@ add_task(async function test_addon_install() {
     "policies": {
       "Extensions": {
         "Install": [
-          `${BASE_URL}/policytest_v0.1.xpi`,
+          "http://mochi.test:8888/browser/browser/components/enterprisepolicies/tests/browser/policytest.xpi",
         ],
         "Locked": [
           addonID,
@@ -22,7 +21,6 @@ add_task(async function test_addon_install() {
   await installPromise;
   let addon = await AddonManager.getAddonByID(addonID);
   isnot(addon, null, "Addon not installed.");
-  is(addon.version, "0.1", "Addon version is correct");
 
   Assert.deepEqual(addon.installTelemetryInfo, {source: "enterprise-policy"},
                    "Got the expected addon.installTelemetryInfo");
@@ -43,40 +41,7 @@ add_task(async function test_addon_locked() {
   BrowserTestUtils.removeTab(tab);
 });
 
-add_task(async function test_addon_reinstall() {
-  // Test that uninstalling and reinstalling the same addon ID works as expected.
-  // This can be used to update an addon.
-
-  let uninstallPromise = wait_for_addon_uninstall();
-  let installPromise = wait_for_addon_install();
-  await setupPolicyEngineWithJson({
-    "policies": {
-      "Extensions": {
-        "Uninstall": [
-          addonID,
-        ],
-        "Install": [
-          `${BASE_URL}/policytest_v0.2.xpi`,
-        ],
-      },
-    },
-  });
-
-  // Older version was uninstalled
-  await uninstallPromise;
-
-  // New version was installed
-  await installPromise;
-
-  let addon = await AddonManager.getAddonByID(addonID);
-  isnot(addon, null, "Addon still exists because the policy was used to update it.");
-  is(addon.version, "0.2", "New version is correct");
-});
-
-
 add_task(async function test_addon_uninstall() {
-  EnterprisePolicyTesting.resetRunOnceState();
-
   let uninstallPromise = wait_for_addon_uninstall();
   await setupPolicyEngineWithJson({
     "policies": {
diff --git a/browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi b/browser/components/enterprisepolicies/tests/browser/policytest.xpi
similarity index 100%
rename from browser/components/enterprisepolicies/tests/browser/policytest_v0.1.xpi
rename to browser/components/enterprisepolicies/tests/browser/policytest.xpi
diff --git a/browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi b/browser/components/enterprisepolicies/tests/browser/policytest_v0.2.xpi
deleted file mode 100644
index e69de29bb2d1..000000000000

From f26087e296ad3d19ae67652aad079a311fc8a289 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Fri, 9 Nov 2018 01:10:54 +0200
Subject: [PATCH 57/77] Backed out changeset d1ff54300cc9 (bug 1499193) for
 bustage on TelemetryHistogram. CLOSED TREE

---
 toolkit/components/telemetry/Histograms.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index d0d2ab7d1330..57cd111089bc 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -7998,9 +7998,7 @@
     "kind": "count",
     "keyed": true,
     "releaseChannelCollection": "opt-out",
-    "description": "Records search counts for search access points and in content searches. For search access points in general and for the urlbar when an internal @engine shorcut is not used, the format is: <engine-name>.<search-access-point> For the urlbar when an internal @engine shortcut is used, the format is: <engine-name>.<@engine>.urlbar For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
-    "alert_emails": ["adw@mozilla.com"],
-    "bug_numbers": [1089670, 1482158, 1499193],
+    "description": "Records search counts for search access points and in content searches. For search access points, the format is: <engine-name>.<search-access-point> For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
   },
   "SEARCH_RESET_RESULT": {
     "record_in_processes": ["main", "content"],

From 57eccc941bbe61eb282417646aa2361f763ebab4 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Fri, 9 Nov 2018 01:57:21 +0200
Subject: [PATCH 58/77] Backed out 4 changesets (bug 1504133) for damp failures
 on TalosParentProfiler. CLOSED TREE

Backed out changeset 443ffec35c5f (bug 1504133)
Backed out changeset 7bd65d135a65 (bug 1504133)
Backed out changeset c544521fcec8 (bug 1504133)
Backed out changeset e9d439c05850 (bug 1504133)

--HG--
rename : testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm => testing/talos/talos/talos-powers/content/TalosParentProfiler.js
---
 testing/talos/talos/pageloader/api.js         |  21 +-
 .../talos/pageloader/chrome/pageloader.js     |   6 +-
 .../startup_test/sessionrestore/addon/api.js  |  20 +-
 .../sessionrestore/addon/content/index.html   |  21 ++
 .../sessionrestore/addon/content/main.js      |  40 ++++
 .../content/TalosParentProfiler.js            | 213 +++++++++++++++++
 .../content/TalosParentProfiler.jsm           | 217 ------------------
 .../talos/tests/cpstartup/extension/api.js    |   8 +-
 .../tests/devtools/addon/content/damp.js      |   4 +-
 testing/talos/talos/tests/tabpaint/api.js     |   6 +-
 testing/talos/talos/tests/tabswitch/api.js    |   2 +-
 11 files changed, 297 insertions(+), 261 deletions(-)
 create mode 100755 testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
 create mode 100755 testing/talos/talos/startup_test/sessionrestore/addon/content/main.js
 create mode 100644 testing/talos/talos/talos-powers/content/TalosParentProfiler.js
 delete mode 100644 testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm

diff --git a/testing/talos/talos/pageloader/api.js b/testing/talos/talos/pageloader/api.js
index 2c18de193636..531ca099ac12 100644
--- a/testing/talos/talos/pageloader/api.js
+++ b/testing/talos/talos/pageloader/api.js
@@ -39,7 +39,6 @@
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
 XPCOMUtils.defineLazyServiceGetter(this, "aomStartup",
                                    "@mozilla.org/addons/addon-manager-startup;1",
@@ -94,25 +93,9 @@ this.pageloader = class extends ExtensionAPI {
     ]);
 
     if (env.exists("MOZ_USE_PAGELOADER")) {
-      // TalosPowers is a separate WebExtension that may or may not already have
-      // finished loading. tryLoad is used to wait for TalosPowers to be around
-      // before continuing.
-      async function tryLoad() {
-        try {
-          ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm");
-        } catch (err) {
-          await new Promise(resolve => setTimeout(resolve, 500));
-          return tryLoad();
-        }
-
-        return null;
-      }
-
-      // talosStart is async but we're deliberately not await-ing or return-ing
+      // This is async but we're delibeately not await-ing or return-ing
       // it here since it doesn't block extension startup.
-      tryLoad().then(() => {
-        talosStart();
-      });
+      talosStart();
     }
   }
 
diff --git a/testing/talos/talos/pageloader/chrome/pageloader.js b/testing/talos/talos/pageloader/chrome/pageloader.js
index 3c76b921a84f..041443cfb321 100644
--- a/testing/talos/talos/pageloader/chrome/pageloader.js
+++ b/testing/talos/talos/pageloader/chrome/pageloader.js
@@ -8,8 +8,10 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/E10SUtils.jsm");
-ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
-                               "resource://talos-powers/TalosParentProfiler.jsm");
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
+                                  "resource://talos-powers/TalosParentProfiler.js");
 
 var NUM_CYCLES = 5;
 var numPageCycles = 1;
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/api.js b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
index f66a9f6f57f8..25cf0a4545ba 100644
--- a/testing/talos/talos/startup_test/sessionrestore/addon/api.js
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/api.js
@@ -9,14 +9,15 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetters(this, {
-  BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.jsm",
   Services: "resource://gre/modules/Services.jsm",
   SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   StartupPerformance: "resource:///modules/sessionstore/StartupPerformance.jsm",
-  TalosParentProfiler: "resource://talos-powers/TalosParentProfiler.jsm",
 });
 
+XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
+                                  "resource://talos-powers/TalosParentProfiler.js");
+
 /* globals ExtensionAPI */
 
 this.sessionrestore = class extends ExtensionAPI {
@@ -46,21 +47,6 @@ this.sessionrestore = class extends ExtensionAPI {
             async function observe() {
               Services.obs.removeObserver(observe, StartupPerformance.RESTORED_TOPIC);
 
-              let win = BrowserWindowTracker.getTopWindow();
-              let args = win.arguments[0];
-              if (args && args instanceof Ci.nsIArray) {
-                // For start-up tests Gecko Profiler arguments are passed to the first URL in
-                // the query string, with the presumption that some tab that is loaded at start-up
-                // will want to use them in the TalosContentProfiler.js script.
-                //
-                // Because we're running this part of the test in the parent process, we
-                // pull those arguments from the top window directly. This is mainly so
-                // that TalosParentProfiler knows where to save the profile.
-                Cu.importGlobalProperties(["URL"]);
-                let url = new URL(args.queryElementAt(0, Ci.nsISupportsString).data);
-                TalosParentProfiler.initFromURLQueryParams(url.search);
-              }
-
               await TalosParentProfiler.pause("This test measures the time between sessionRestoreInit and sessionRestored, ignore everything around that");
               await TalosParentProfiler.finishStartupProfiling();
 
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html b/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
new file mode 100755
index 000000000000..ed0a9a8a595a
--- /dev/null
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/content/index.html
@@ -0,0 +1,21 @@
+<html>
+<head>
+
+<meta charset="UTF-8"/>
+<title>Session Restore Regression Test</title>
+
+<script type="text/javascript" src="chrome://pageloader/content/MozillaFileLogger.js"></script>
+<script type="text/javascript" src="resource://talos-powers/TalosContentProfiler.js"></script>
+<script type="text/javascript" src="resource://talos-powers/TalosPowersContent.js"></script>
+<script type="text/javascript" src="chrome://session-restore-test/content/main.js">
+</script>
+
+<div>
+  <strong>Time between sessionRestoreInit and sessionRestored</strong>
+  <span id="sessionRestoreInit-to-sessionRestored">
+  (in progress)
+  </span>
+</div>
+
+</body>
+</html>
diff --git a/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js b/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js
new file mode 100755
index 000000000000..c41799233c5c
--- /dev/null
+++ b/testing/talos/talos/startup_test/sessionrestore/addon/content/main.js
@@ -0,0 +1,40 @@
+"use strict";
+
+var Services = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services;
+
+// Process Message Manager topics.
+const MSG_REQUEST = "session-restore-test?duration";
+const MSG_PROVIDE = "session-restore-test:duration";
+
+addEventListener("load", function() {
+  Services.cpmm.addMessageListener(MSG_PROVIDE,
+    /**
+     * Display the result, send it to the harness and quit.
+     */
+    async function finish(msg) {
+      console.log(`main.js: received data on ${MSG_PROVIDE}`, msg);
+      Services.cpmm.removeMessageListener(MSG_PROVIDE, finish);
+      var duration = msg.data.duration;
+      TalosContentProfiler.initFromURLQueryParams(location.search);
+      await TalosContentProfiler.pause("This test measures the time between sessionRestoreInit and sessionRestored, ignore everything around that");
+      await TalosContentProfiler.finishStartupProfiling();
+
+      // Show result on screen. Nice but not really necessary.
+      document.getElementById("sessionRestoreInit-to-sessionRestored").textContent = duration + "ms";
+
+      // Report data to Talos, if possible
+      dumpLog("__start_report" +
+              duration +
+              "__end_report\n\n");
+
+      // Next one is required by the test harness but not used
+      dumpLog("__startTimestamp" +
+              Date.now() + // eslint-disable-line mozilla/avoid-Date-timing
+              "__endTimestamp\n\n");
+      TalosPowersContent.goQuitApplication();
+  });
+
+  // In case the add-on has broadcasted the message before we were loaded,
+  // request a second broadcast.
+  Services.cpmm.sendAsyncMessage(MSG_REQUEST, {});
+});
diff --git a/testing/talos/talos/talos-powers/content/TalosParentProfiler.js b/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
new file mode 100644
index 000000000000..156687c7120b
--- /dev/null
+++ b/testing/talos/talos/talos-powers/content/TalosParentProfiler.js
@@ -0,0 +1,213 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * This utility script is for instrumenting your Talos test for
+ * performance profiles while running within the parent process.
+ * Almost all of the functions that this script exposes to the
+ * Gecko Profiler are synchronous, except for finishTest, since that
+ * involves requesting the profiles from any content processes and
+ * then writing to disk.
+ *
+ * If your test is running in the content process, you should use
+ * TalosContentProfiler.js instead.
+ */
+
+var TalosParentProfiler;
+
+(function() {
+  ChromeUtils.import("resource://gre/modules/Services.jsm");
+
+  // Whether or not this TalosContentProfiler object has had initFromObject
+  // or initFromURLQueryParams called on it. Any functions that change the
+  // state of the Gecko Profiler should only be called after calling either
+  // initFromObject or initFromURLQueryParams.
+  let initted = Services.profiler.IsActive();
+
+  // The subtest name that beginTest() was called with.
+  let currentTest = "unknown";
+
+  // Profiler settings.
+  let interval, entries, threadsArray, profileDir;
+
+  // Use a bit of XPCOM hackery to get at the Talos Powers service
+  // implementation...
+  let TalosPowers =
+    Cc["@mozilla.org/talos/talos-powers-service;1"]
+      .getService(Ci.nsISupports)
+      .wrappedJSObject;
+
+  /**
+   * Parses an url query string into a JS object.
+   *
+   * @param locationSearch (string)
+   *        The location string to parse.
+   * @returns Object
+   *        The GET params from the location string as
+   *        key-value pairs in the Object.
+   */
+  function searchToObject(locationSearch) {
+    let pairs = locationSearch.substring(1).split("&");
+    let result = {};
+
+    for (let i in pairs) {
+      if (pairs[i] !== "") {
+        let pair = pairs[i].split("=");
+        result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || "");
+      }
+    }
+
+    return result;
+  }
+
+  TalosParentProfiler = {
+    /**
+     * Initialize the profiler using profiler settings supplied in a JS object.
+     *
+     * @param obj (object)
+     *   The following properties on the object are respected:
+     *     gecko_profile_interval (int)
+     *     gecko_profile_entries (int)
+     *     gecko_profile_threads (string, comma separated list of threads to filter with)
+     *     gecko_profile_dir (string)
+     */
+    initFromObject(obj = {}) {
+      if (!initted) {
+        if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
+            ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
+            ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
+            ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
+          interval = obj.gecko_profile_interval;
+          entries = obj.gecko_profile_entries;
+          threadsArray = obj.gecko_profile_threads.split(",");
+          profileDir = obj.gecko_profile_dir;
+          initted = true;
+        } else {
+          console.error("Profiler could not init with object: " + JSON.stringify(obj));
+        }
+      }
+    },
+
+    /**
+     * Initialize the profiler using a string from a location string.
+     *
+     * @param locationSearch (string)
+     *        The location string to initialize with.
+     */
+    initFromURLQueryParams(locationSearch) {
+      this.initFromObject(searchToObject(locationSearch));
+    },
+
+    /**
+     * A Talos test is about to start. Note that the Gecko Profiler will be
+     * paused immediately after starting and that resume() should be called
+     * in order to collect samples.
+     *
+     * @param testName (string)
+     *        The name of the test to use in Profiler markers.
+     */
+    beginTest(testName) {
+      if (initted) {
+        currentTest = testName;
+        TalosPowers.profilerBegin({ entries, interval, threadsArray });
+      } else {
+        let msg = "You should not call beginTest without having first " +
+                  "initted the Profiler";
+        console.error(msg);
+      }
+    },
+
+    /**
+     * A Talos test has finished. This will stop the Gecko Profiler from
+     * sampling, and return a Promise that resolves once the Profiler has
+     * finished dumping the multi-process profile to disk.
+     *
+     * @returns Promise
+     *          Resolves once the profile has been dumped to disk. The test should
+     *          not try to quit the browser until this has resolved.
+     */
+    finishTest() {
+      if (initted) {
+        let profileFile = profileDir + "/" + currentTest + ".profile";
+        return TalosPowers.profilerFinish(profileFile);
+      }
+        let msg = "You should not call finishTest without having first " +
+                  "initted the Profiler";
+        console.error(msg);
+        return Promise.reject(msg);
+
+    },
+
+    /**
+     * A start-up test has finished. Callers don't need to run beginTest or
+     * finishTest, but should pause the sampler as soon as possible, and call
+     * this function to dump the profile.
+     *
+     * @returns Promise
+     *          Resolves once the profile has been dumped to disk. The test should
+     *          not try to quit the browser until this has resolved.
+     */
+    finishStartupProfiling() {
+      if (initted) {
+        let profileFile = profileDir + "/startup.profile";
+        return TalosPowers.profilerFinish(profileFile);
+      }
+      return Promise.resolve();
+    },
+
+    /**
+     * Resumes the Gecko Profiler sampler. Can also simultaneously set a marker.
+     *
+     * @returns Promise
+     *          Resolves once the Gecko Profiler has resumed.
+     */
+    resume(marker = "") {
+      if (initted) {
+        TalosPowers.profilerResume(marker);
+      }
+    },
+
+    /**
+     * Pauses the Gecko Profiler sampler. Can also simultaneously set a marker.
+     *
+     * @returns Promise
+     *          Resolves once the Gecko Profiler has paused.
+     */
+    pause(marker = "") {
+      if (initted) {
+        TalosPowers.profilerPause(marker);
+      }
+    },
+
+    /**
+     * Adds a marker to the profile.
+     *
+     * @returns Promise
+     *          Resolves once the marker has been set.
+     */
+    mark(marker) {
+      if (initted) {
+        // If marker is omitted, just use the test name
+        if (!marker) {
+          marker = currentTest;
+        }
+
+        TalosPowers.profilerMarker(marker);
+      }
+    },
+
+    afterProfileGathered() {
+      if (!initted) {
+        return Promise.resolve();
+      }
+
+      return new Promise(resolve => {
+        Services.obs.addObserver(function onGathered() {
+          Services.obs.removeObserver(onGathered, "talos-profile-gathered");
+          resolve();
+        }, "talos-profile-gathered");
+      });
+    },
+  };
+})();
diff --git a/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm b/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
deleted file mode 100644
index a237c0fe54bb..000000000000
--- a/testing/talos/talos/talos-powers/content/TalosParentProfiler.jsm
+++ /dev/null
@@ -1,217 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
- * This module is for instrumenting your Talos test for
- * performance profiles while running within the parent process.
- * Almost all of the functions that this script exposes to the
- * Gecko Profiler are synchronous, except for finishTest, since that
- * involves requesting the profiles from any content processes and
- * then writing to disk.
- *
- * If your test is running in the content process, you should use the
- * TalosContentProfiler.js utility script instead.
- */
-
-var EXPORTED_SYMBOLS = ["TalosParentProfiler"];
-
-ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-const TalosParentProfiler = {
-  // Whether or not this TalosContentProfiler object has had initFromObject
-  // or initFromURLQueryParams called on it. Any functions that change the
-  // state of the Gecko Profiler should only be called after calling either
-  // initFromObject or initFromURLQueryParams.
-  initted: false,
-  // The subtest name that beginTest() was called with.
-  currentTest: "unknown",
-  // Profiler settings.
-  interval: undefined,
-  entries: undefined,
-  threadsArray: undefined,
-  profileDir: undefined,
-
-  get TalosPowers() {
-    // Use a bit of XPCOM hackery to get at the Talos Powers service
-    // implementation...
-    return Cc["@mozilla.org/talos/talos-powers-service;1"]
-             .getService(Ci.nsISupports)
-             .wrappedJSObject;
-  },
-
-  /**
-   * Initialize the profiler using profiler settings supplied in a JS object.
-   *
-   * @param obj (object)
-   *   The following properties on the object are respected:
-   *     gecko_profile_interval (int)
-   *     gecko_profile_entries (int)
-   *     gecko_profile_threads (string, comma separated list of threads to filter with)
-   *     gecko_profile_dir (string)
-   */
-  initFromObject(obj = {}) {
-    if (!this.initted) {
-      if (("gecko_profile_dir" in obj) && typeof obj.gecko_profile_dir == "string" &&
-          ("gecko_profile_interval" in obj) && Number.isFinite(obj.gecko_profile_interval * 1) &&
-          ("gecko_profile_entries" in obj) && Number.isFinite(obj.gecko_profile_entries * 1) &&
-          ("gecko_profile_threads" in obj) && typeof obj.gecko_profile_threads == "string") {
-        this.interval = obj.gecko_profile_interval;
-        this.entries = obj.gecko_profile_entries;
-        this.threadsArray = obj.gecko_profile_threads.split(",");
-        this.profileDir = obj.gecko_profile_dir;
-        this.initted = true;
-      } else {
-        console.error("Profiler could not init with object: " + JSON.stringify(obj));
-      }
-    }
-  },
-
-  /**
-   * Initialize the profiler using a string from a location string.
-   *
-   * @param locationSearch (string)
-   *        The location string to initialize with.
-   */
-  initFromURLQueryParams(locationSearch) {
-    this.initFromObject(this.searchToObject(locationSearch));
-  },
-
-  /**
-   * Parses an url query string into a JS object.
-   *
-   * @param locationSearch (string)
-   *        The location string to parse.
-   * @returns Object
-   *        The GET params from the location string as
-   *        key-value pairs in the Object.
-   */
-  searchToObject(locationSearch) {
-    let pairs = locationSearch.substring(1).split("&");
-    let result = {};
-
-    for (let i in pairs) {
-      if (pairs[i] !== "") {
-        let pair = pairs[i].split("=");
-        result[decodeURIComponent(pair[0])] = decodeURIComponent(pair[1] || "");
-      }
-    }
-
-    return result;
-  },
-
-  /**
-   * A Talos test is about to start. Note that the Gecko Profiler will be
-   * paused immediately after starting and that resume() should be called
-   * in order to collect samples.
-   *
-   * @param testName (string)
-   *        The name of the test to use in Profiler markers.
-   */
-  beginTest(testName) {
-    if (this.initted) {
-      this.currentTest = testName;
-      this.TalosPowers.profilerBegin({
-        entries: this.entries,
-        interval: this.interval,
-        threadsArray: this.threadsArray,
-      });
-    } else {
-      let msg = "You should not call beginTest without having first " +
-                "initted the Profiler";
-      console.error(msg);
-    }
-  },
-
-  /**
-   * A Talos test has finished. This will stop the Gecko Profiler from
-   * sampling, and return a Promise that resolves once the Profiler has
-   * finished dumping the multi-process profile to disk.
-   *
-   * @returns Promise
-   *          Resolves once the profile has been dumped to disk. The test should
-   *          not try to quit the browser until this has resolved.
-   */
-  finishTest() {
-    if (this.initted) {
-      let profileFile = this.profileDir + "/" + this.currentTest + ".profile";
-      return this.TalosPowers.profilerFinish(profileFile);
-    }
-      let msg = "You should not call finishTest without having first " +
-                "initted the Profiler";
-      console.error(msg);
-      return Promise.reject(msg);
-
-  },
-
-  /**
-   * A start-up test has finished. Callers don't need to run beginTest or
-   * finishTest, but should pause the sampler as soon as possible, and call
-   * this function to dump the profile.
-   *
-   * @returns Promise
-   *          Resolves once the profile has been dumped to disk. The test should
-   *          not try to quit the browser until this has resolved.
-   */
-  finishStartupProfiling() {
-    if (this.initted) {
-      let profileFile = this.profileDir + "/startup.profile";
-      return this.TalosPowers.profilerFinish(profileFile);
-    }
-    return Promise.resolve();
-  },
-
-  /**
-   * Resumes the Gecko Profiler sampler. Can also simultaneously set a marker.
-   *
-   * @returns Promise
-   *          Resolves once the Gecko Profiler has resumed.
-   */
-  resume(marker = "") {
-    if (this.initted) {
-      this.TalosPowers.profilerResume(marker);
-    }
-  },
-
-  /**
-   * Pauses the Gecko Profiler sampler. Can also simultaneously set a marker.
-   *
-   * @returns Promise
-   *          Resolves once the Gecko Profiler has paused.
-   */
-  pause(marker = "") {
-    if (this.initted) {
-      this.TalosPowers.profilerPause(marker);
-    }
-  },
-
-  /**
-   * Adds a marker to the profile.
-   *
-   * @returns Promise
-   *          Resolves once the marker has been set.
-   */
-  mark(marker) {
-    if (this.initted) {
-      // If marker is omitted, just use the test name
-      if (!marker) {
-        marker = this.currentTest;
-      }
-
-      this.TalosPowers.profilerMarker(marker);
-    }
-  },
-
-  afterProfileGathered() {
-    if (!this.initted) {
-      return Promise.resolve();
-    }
-
-    return new Promise(resolve => {
-      Services.obs.addObserver(function onGathered() {
-        Services.obs.removeObserver(onGathered, "talos-profile-gathered");
-        resolve();
-      }, "talos-profile-gathered");
-    });
-  },
-};
diff --git a/testing/talos/talos/tests/cpstartup/extension/api.js b/testing/talos/talos/tests/cpstartup/extension/api.js
index c206cd671d14..aec982092e17 100644
--- a/testing/talos/talos/tests/cpstartup/extension/api.js
+++ b/testing/talos/talos/tests/cpstartup/extension/api.js
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+
+
 /**
  * The purpose of this test it to measure the performance of a
  * content process startup.
@@ -15,8 +18,9 @@
  * the content side, just the overhead of spawning a new content process.
  */
 
-ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
-                                  "resource://talos-powers/TalosParentProfiler.jsm");
+XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
+                                  "resource://talos-powers/TalosParentProfiler.js");
+
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
 
diff --git a/testing/talos/talos/tests/devtools/addon/content/damp.js b/testing/talos/talos/tests/devtools/addon/content/damp.js
index 831a531b1139..e938cf265f76 100644
--- a/testing/talos/talos/tests/devtools/addon/content/damp.js
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.js
@@ -1,8 +1,10 @@
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm", {});
 const { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm", {});
 const { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
-const { TalosParentProfiler } = ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm", {});
 const env = Cc["@mozilla.org/process/environment;1"].getService(Ci.nsIEnvironment);
+let scope = {};
+Services.scriptloader.loadSubScript("resource://talos-powers/TalosParentProfiler.js", scope);
+const { TalosParentProfiler } = scope;
 
 XPCOMUtils.defineLazyGetter(this, "require", function() {
   let { require } =
diff --git a/testing/talos/talos/tests/tabpaint/api.js b/testing/talos/talos/tests/tabpaint/api.js
index 443040f2eee3..92aee03bcc14 100644
--- a/testing/talos/talos/tests/tabpaint/api.js
+++ b/testing/talos/talos/tests/tabpaint/api.js
@@ -20,10 +20,12 @@
  *    for certain types of links (_blank links for example) to open new tabs.
  */
 
+ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.defineModuleGetter(this, "Services",
                                "resource://gre/modules/Services.jsm");
-ChromeUtils.defineModuleGetter(this, "TalosParentProfiler",
-                               "resource://talos-powers/TalosParentProfiler.jsm");
+
+XPCOMUtils.defineLazyScriptGetter(this, "TalosParentProfiler",
+                                  "resource://talos-powers/TalosParentProfiler.js");
 
 const ANIMATION_PREF = "toolkit.cosmeticAnimations.enabled";
 const MULTI_OPT_OUT_PREF = "dom.ipc.multiOptOut";
diff --git a/testing/talos/talos/tests/tabswitch/api.js b/testing/talos/talos/tests/tabswitch/api.js
index d490b3b19e78..ef52b8bb8cbc 100644
--- a/testing/talos/talos/tests/tabswitch/api.js
+++ b/testing/talos/talos/tests/tabswitch/api.js
@@ -190,7 +190,7 @@ async function test(window) {
     return;
   }
 
-  ChromeUtils.import("resource://talos-powers/TalosParentProfiler.jsm", context);
+  Services.scriptloader.loadSubScript("resource://talos-powers/TalosParentProfiler.js", context);
   TalosParentProfiler = context.TalosParentProfiler;
 
   let testURLs = [];

From a5ca9eb6ffcb963dd85de9c304ed4f3faa4a0f68 Mon Sep 17 00:00:00 2001
From: Csoregi Natalia <ncsoregi@mozilla.com>
Date: Fri, 9 Nov 2018 02:47:36 +0200
Subject: [PATCH 59/77] Backed out changeset a6b390c7b979 (bug 1498246) for
 failures on
 org.mozilla.geckoview.test.GeckoSessionTestRuleTest.includesAllCallbacks.
 CLOSED TREE

---
 .../chrome/geckoview/GeckoViewMediaChild.js   | 433 --------------
 mobile/android/chrome/geckoview/geckoview.js  |   6 -
 mobile/android/chrome/geckoview/jar.mn        |   1 -
 .../org/mozilla/geckoview/GeckoSession.java   | 114 +---
 .../org/mozilla/geckoview/MediaElement.java   | 540 ------------------
 .../modules/geckoview/GeckoViewMedia.jsm      |  33 --
 mobile/android/modules/geckoview/moz.build    |   1 -
 7 files changed, 1 insertion(+), 1127 deletions(-)
 delete mode 100644 mobile/android/chrome/geckoview/GeckoViewMediaChild.js
 delete mode 100644 mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
 delete mode 100644 mobile/android/modules/geckoview/GeckoViewMedia.jsm

diff --git a/mobile/android/chrome/geckoview/GeckoViewMediaChild.js b/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
deleted file mode 100644
index 7acdc7ee6f7c..000000000000
--- a/mobile/android/chrome/geckoview/GeckoViewMediaChild.js
+++ /dev/null
@@ -1,433 +0,0 @@
-/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-ChromeUtils.import("resource://gre/modules/GeckoViewChildModule.jsm");
-ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-
-class GeckoViewMediaChild extends GeckoViewChildModule {
-  onInit() {
-    this._videoIndex = 0;
-    XPCOMUtils.defineLazyGetter(this, "_videos", () =>
-      new Map());
-    this._mediaEvents = [
-      "abort", "canplay", "canplaythrough", "durationchange", "emptied",
-      "ended", "error", "loadeddata", "loadedmetadata", "pause", "play", "playing",
-      "progress", "ratechange", "resize", "seeked", "seeking", "stalled", "suspend",
-      "timeupdate", "volumechange", "waiting",
-    ];
-
-    this._mediaEventCallback = (event) => {
-      this.handleMediaEvent(event);
-    };
-    this._fullscreenMedia = null;
-    this._stateSymbol = Symbol();
-  }
-
-  onEnable() {
-    debug `onEnable`;
-    addEventListener("UAWidgetBindToTree", this, false);
-    addEventListener("MozDOMFullscreen:Entered", this, false);
-    addEventListener("MozDOMFullscreen:Exited", this, false);
-    addEventListener("pagehide", this, false);
-
-    this.messageManager.addMessageListener("GeckoView:MediaObserve", this);
-    this.messageManager.addMessageListener("GeckoView:MediaUnobserve", this);
-    this.messageManager.addMessageListener("GeckoView:MediaPlay", this);
-    this.messageManager.addMessageListener("GeckoView:MediaPause", this);
-    this.messageManager.addMessageListener("GeckoView:MediaSeek", this);
-    this.messageManager.addMessageListener("GeckoView:MediaSetVolume", this);
-    this.messageManager.addMessageListener("GeckoView:MediaSetMuted", this);
-    this.messageManager.addMessageListener("GeckoView:MediaSetPlaybackRate", this);
-  }
-
-  onDisable() {
-    debug `onDisable`;
-
-    removeEventListener("UAWidgetBindToTree", this);
-    removeEventListener("MozDOMFullscreen:Entered", this);
-    removeEventListener("MozDOMFullscreen:Exited", this);
-    removeEventListener("pagehide", this);
-
-    this.messageManager.removeMessageListener("GeckoView:MediaObserve", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaUnobserve", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaPlay", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaPause", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaSeek", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaSetVolume", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaSetMuted", this);
-    this.messageManager.removeMessageListener("GeckoView:MediaSetPlaybackRate", this);
-  }
-
-  receiveMessage(aMsg) {
-    debug `receiveMessage: ${aMsg.name}`;
-
-    const data = aMsg.data;
-    const element = this.findElement(data.id);
-    if (!element) {
-      warn `Didn't find HTMLMediaElement with id: ${data.id}`;
-      return;
-    }
-
-    switch (aMsg.name) {
-      case "GeckoView:MediaObserve":
-        this.observeMedia(element);
-        break;
-      case "GeckoView:MediaUnobserve":
-        this.unobserveMedia(element);
-        break;
-      case "GeckoView:MediaPlay":
-        element.play();
-        break;
-      case "GeckoView:MediaPause":
-        element.pause();
-        break;
-      case "GeckoView:MediaSeek":
-        element.currentTime = data.time;
-        break;
-      case "GeckoView:MediaSetVolume":
-        element.volume = data.volume;
-        break;
-      case "GeckoView:MediaSetMuted":
-        element.muted = !!data.muted;
-        break;
-      case "GeckoView:MediaSetPlaybackRate":
-        element.playbackRate = data.playbackRate;
-        break;
-    }
-  }
-
-  handleEvent(aEvent) {
-    debug `handleEvent: ${aEvent.type}`;
-
-    switch (aEvent.type) {
-      case "UAWidgetBindToTree":
-        this.handleNewMedia(aEvent.composedTarget);
-        break;
-      case "MozDOMFullscreen:Entered":
-        const element = content && content.document.fullscreenElement;
-        if (this.isMedia(element)) {
-          this.handleFullscreenChange(element);
-        } else {
-          // document.fullscreenElement can be a div container instead of the HTMLMediaElement
-          // in some pages (e.g Vimeo).
-          const childrenMedias = element.getElementsByTagName("video");
-          if (childrenMedias && childrenMedias.length > 0) {
-            this.handleFullscreenChange(childrenMedias[0]);
-          }
-        }
-        break;
-      case "MozDOMFullscreen:Exited":
-        this.handleFullscreenChange(null);
-        break;
-      case "pagehide":
-        if (aEvent.target === content.document) {
-          this.handleWindowUnload();
-        }
-        break;
-    }
-  }
-
-  handleWindowUnload() {
-    for (const weakElement of this._videos.values()) {
-      const element = weakElement.get();
-      if (element) {
-        this.unobserveMedia(element);
-      }
-    }
-    if (this._videos.size > 0) {
-      this.notifyMediaRemoveAll();
-    }
-    this._videos.clear();
-    this._fullscreenMedia = null;
-  }
-
-  handleNewMedia(aElement) {
-    if (this.getState(aElement) || !this.isMedia(aElement)) {
-      return;
-    }
-    const state = {
-      id: ++this._videoIndex,
-      notified: false,
-      observing: false,
-    };
-    aElement[this._stateSymbol] = state;
-    this._videos.set(state.id, Cu.getWeakReference(aElement));
-
-    this.notifyNewMedia(aElement);
-  }
-
-  notifyNewMedia(aElement) {
-    this.getState(aElement).notified = true;
-    const message = {
-      type: "GeckoView:MediaAdd",
-      id: this.getState(aElement).id,
-    };
-
-    this.fillMetadata(aElement, message);
-    this.eventDispatcher.sendRequest(message);
-  }
-
-  observeMedia(aElement) {
-    if (this.isObserving(aElement)) {
-      return;
-    }
-    this.getState(aElement).observing = true;
-
-    for (const name of this._mediaEvents) {
-      aElement.addEventListener(name, this._mediaEventCallback, true);
-    }
-
-    // Notify current state
-    this.notifyTimeChange(aElement);
-    this.notifyVolumeChange(aElement);
-    this.notifyRateChange(aElement);
-    if (aElement.readyState >= 1) {
-      this.notifyMetadataChange(aElement);
-    }
-    this.notifyReadyStateChange(aElement);
-    if (!aElement.paused) {
-      this.notifyPlaybackStateChange(aElement, "play");
-    }
-    if (aElement === this._fullscreenMedia) {
-      this.notifyFullscreenChange(aElement, true);
-    }
-    if (this.hasError(aElement)) {
-      this.notifyMediaError(aElement);
-    }
-  }
-
-  unobserveMedia(aElement) {
-    if (!this.isObserving(aElement)) {
-      return;
-    }
-    this.getState(aElement).observing = false;
-    for (const name of this._mediaEvents) {
-      aElement.removeEventListener(name, this._mediaEventCallback);
-    }
-  }
-
-  isMedia(aElement) {
-    if (!aElement) {
-      return false;
-    }
-    const elementType = ChromeUtils.getClassName(aElement);
-    return (elementType === "HTMLVideoElement") || (elementType === "HTMLAudioElement");
-  }
-
-  isObserving(aElement) {
-    return aElement && this.getState(aElement) && this.getState(aElement).observing;
-  }
-
-  findElement(aId) {
-    for (const weakElement of this._videos.values()) {
-      const element = weakElement.get();
-      if (element && this.getState(element).id === aId) {
-        return element;
-      }
-    }
-    return null;
-  }
-
-  getState(aElement) {
-    return aElement[this._stateSymbol];
-  }
-
-  hasError(aElement) {
-    // We either have an explicit error, or networkState is set to NETWORK_NO_SOURCE
-    // after selecting a source.
-    return aElement.error != null ||
-           (aElement.networkState === aElement.NETWORK_NO_SOURCE &&
-            this.hasSources(aElement));
-  }
-
-  hasSources(aElement) {
-    if (aElement.hasAttribute("src") && aElement.getAttribute("src") !== "") {
-      return true;
-    }
-    for (var child = aElement.firstChild; child !== null; child = child.nextElementSibling) {
-      if (child instanceof content.window.HTMLSourceElement) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  fillMetadata(aElement, aOut) {
-    aOut.src = aElement.currentSrc || aElement.src;
-    aOut.width = aElement.videoWidth || 0;
-    aOut.height = aElement.videoHeight || 0;
-    aOut.duration = aElement.duration;
-    aOut.seekable = !!aElement.seekable;
-    if (aElement.audioTracks) {
-      aOut.audioTrackCount = aElement.audioTracks.length;
-    } else {
-      aOut.audioTrackCount = (aElement.mozHasAudio || aElement.webkitAudioDecodedByteCount ||
-        ChromeUtils.getClassName(aElement) === "HTMLAudioElement") ? 1 : 0;
-    }
-    if (aElement.videoTracks) {
-      aOut.videoTrackCount = aElement.videoTracks.length;
-    } else {
-      aOut.videoTrackCount = ChromeUtils.getClassName(aElement) === "HTMLVideoElement" ? 1 : 0;
-    }
-  }
-
-  handleMediaEvent(aEvent) {
-    const element = aEvent.target;
-    if (!this.isObserving(element)) {
-      return;
-    }
-    switch (aEvent.type) {
-      case "timeupdate":
-        this.notifyTimeChange(element);
-        break;
-      case "volumechange":
-        this.notifyVolumeChange(element);
-        break;
-      case "loadedmetadata":
-        this.notifyMetadataChange(element);
-        this.notifyReadyStateChange(element);
-        break;
-      case "ratechange":
-        this.notifyRateChange(element);
-        break;
-      case "error":
-        this.notifyMediaError(element);
-        break;
-      case "progress":
-        this.notifyLoadProgress(element, aEvent);
-        break;
-      case "durationchange": // Fallthrough
-      case "resize":
-        this.notifyMetadataChange(element);
-        break;
-      case "canplay": // Fallthrough
-      case "canplaythrough": // Fallthrough
-      case "loadeddata":
-        this.notifyReadyStateChange(element);
-        break;
-      default:
-        this.notifyPlaybackStateChange(element, aEvent.type);
-        break;
-    }
-  }
-
-  handleFullscreenChange(aElement) {
-    if (aElement === this._fullscreenMedia) {
-      return;
-    }
-
-    if (this.isObserving(this._fullscreenMedia)) {
-      this.notifyFullscreenChange(this._fullscreenMedia, false);
-    }
-    this._fullscreenMedia = aElement;
-
-    if (this.isObserving(aElement)) {
-      this.notifyFullscreenChange(aElement, true);
-    }
-  }
-
-  notifyPlaybackStateChange(aElement, aName) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaPlaybackStateChanged",
-      id: this.getState(aElement).id,
-      playbackState: aName,
-    });
-  }
-
-  notifyReadyStateChange(aElement) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaReadyStateChanged",
-      id: this.getState(aElement).id,
-      readyState: aElement.readyState,
-    });
-  }
-
-  notifyMetadataChange(aElement) {
-    const message = {
-      type: "GeckoView:MediaMetadataChanged",
-      id: this.getState(aElement).id,
-    };
-    this.fillMetadata(aElement, message);
-    this.eventDispatcher.sendRequest(message);
-  }
-
-  notifyLoadProgress(aElement, aEvent) {
-    const message = {
-      type: "GeckoView:MediaProgress",
-      id: this.getState(aElement).id,
-      loadedBytes: aEvent.lengthComputable ? aEvent.loaded : -1,
-      totalBytes: aEvent.lengthComputable ? aEvent.total : -1,
-    };
-    if (aElement.buffered && aElement.buffered.length > 0) {
-      message.timeRangeStarts = [];
-      message.timeRangeEnds = [];
-      for (let i = 0; i < aElement.buffered.length; ++i) {
-        message.timeRangeStarts.push(aElement.buffered.start(i));
-        message.timeRangeEnds.push(aElement.buffered.end(i));
-      }
-    }
-    this.eventDispatcher.sendRequest(message);
-  }
-
-  notifyTimeChange(aElement) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaTimeChanged",
-      id: this.getState(aElement).id,
-      time: aElement.currentTime,
-    });
-  }
-
-  notifyRateChange(aElement) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaRateChanged",
-      id: this.getState(aElement).id,
-      rate: aElement.playbackRate,
-    });
-  }
-
-  notifyVolumeChange(aElement) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaVolumeChanged",
-      id: this.getState(aElement).id,
-      volume: aElement.volume,
-      muted: !!aElement.muted,
-    });
-  }
-
-  notifyFullscreenChange(aElement, aIsFullscreen) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaFullscreenChanged",
-      id: this.getState(aElement).id,
-      fullscreen: aIsFullscreen,
-    });
-  }
-
-  notifyMediaError(aElement) {
-    let code = aElement.error ? aElement.error.code : 0;
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaError",
-      id: this.getState(aElement).id,
-      code: code,
-    });
-  }
-
-  notifyMediaRemove(aElement) {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaRemove",
-      id: this.getState(aElement).id,
-    });
-  }
-
-  notifyMediaRemoveAll() {
-    this.eventDispatcher.sendRequest({
-      type: "GeckoView:MediaRemoveAll",
-    });
-  }
-
-}
-
-const {debug, warn} = GeckoViewMediaChild.initLogging("GeckoViewMedia");
-const module = GeckoViewMediaChild.create(this);
diff --git a/mobile/android/chrome/geckoview/geckoview.js b/mobile/android/chrome/geckoview/geckoview.js
index 1d4c8dc3bb63..530db131c852 100644
--- a/mobile/android/chrome/geckoview/geckoview.js
+++ b/mobile/android/chrome/geckoview/geckoview.js
@@ -391,12 +391,6 @@ function startup() {
       resource: "resource://gre/modules/GeckoViewContent.jsm",
       frameScript: "chrome://geckoview/content/GeckoViewContentChild.js",
     },
-  }, {
-    name: "GeckoViewMedia",
-    onEnable: {
-      resource: "resource://gre/modules/GeckoViewMedia.jsm",
-      frameScript: "chrome://geckoview/content/GeckoViewMediaChild.js",
-    },
   }, {
     name: "GeckoViewNavigation",
     onInit: {
diff --git a/mobile/android/chrome/geckoview/jar.mn b/mobile/android/chrome/geckoview/jar.mn
index 5b5f51d174dc..52b53b46a391 100644
--- a/mobile/android/chrome/geckoview/jar.mn
+++ b/mobile/android/chrome/geckoview/jar.mn
@@ -13,7 +13,6 @@ geckoview.jar:
   content/geckoview.xul
   content/geckoview.js
   content/GeckoViewContentChild.js
-  content/GeckoViewMediaChild.js
   content/GeckoViewNavigationChild.js
   content/GeckoViewProgressChild.js
   content/GeckoViewPromptChild.js
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
index 755798de093f..e776d26649ee 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -49,7 +49,6 @@ import android.support.annotation.StringDef;
 import android.support.annotation.UiThread;
 import android.util.Base64;
 import android.util.Log;
-import android.util.LongSparseArray;
 import android.view.Surface;
 import android.view.inputmethod.CursorAnchorInfo;
 import android.view.inputmethod.ExtractedText;
@@ -520,85 +519,10 @@ public class GeckoSession extends LayerSession
             }
         };
 
-    private LongSparseArray<MediaElement> mMediaElements = new LongSparseArray<>();
-    /* package */ LongSparseArray<MediaElement> getMediaElements() {
-        return mMediaElements;
-    }
-    private final GeckoSessionHandler<MediaDelegate> mMediaHandler =
-            new GeckoSessionHandler<MediaDelegate>(
-                    "GeckoViewMedia", this,
-                    new String[]{
-                            "GeckoView:MediaAdd",
-                            "GeckoView:MediaRemove",
-                            "GeckoView:MediaRemoveAll",
-                            "GeckoView:MediaReadyStateChanged",
-                            "GeckoView:MediaTimeChanged",
-                            "GeckoView:MediaPlaybackStateChanged",
-                            "GeckoView:MediaMetadataChanged",
-                            "GeckoView:MediaProgress",
-                            "GeckoView:MediaVolumeChanged",
-                            "GeckoView:MediaRateChanged",
-                            "GeckoView:MediaFullscreenChanged",
-                            "GeckoView:MediaError",
-                    }
-            ) {
-                @Override
-                public void handleMessage(final MediaDelegate delegate,
-                                          final String event,
-                                          final GeckoBundle message,
-                                          final EventCallback callback) {
-                    if ("GeckoView:MediaAdd".equals(event)) {
-                        final MediaElement element = new MediaElement(message.getLong("id"), GeckoSession.this);
-                        delegate.onMediaAdd(GeckoSession.this, element);
-                        return;
-                    } else if ("GeckoView:MediaRemoveAll".equals(event)) {
-                        for (int i = 0; i < mMediaElements.size(); i++) {
-                            final long key = mMediaElements.keyAt(i);
-                            delegate.onMediaRemove(GeckoSession.this, mMediaElements.get(key));
-                        }
-                        mMediaElements.clear();
-                        return;
-                    }
-
-                    final long id = message.getLong("id", 0);
-                    final MediaElement element = mMediaElements.get(id);
-                    if (element == null) {
-                        Log.w(LOGTAG, "MediaElement not found for '" + id + "'");
-                        return;
-                    }
-
-                    if ("GeckoView:MediaTimeChanged".equals(event)) {
-                        element.notifyTimeChange(message.getDouble("time"));
-                    } else if ("GeckoView:MediaProgress".equals(event)) {
-                        element.notifyLoadProgress(message);
-                    } else if ("GeckoView:MediaMetadataChanged".equals(event)) {
-                        element.notifyMetadataChange(message);
-                    } else if ("GeckoView:MediaReadyStateChanged".equals(event)) {
-                        element.notifyReadyStateChange(message.getInt("readyState"));
-                    } else if ("GeckoView:MediaPlaybackStateChanged".equals(event)) {
-                        element.notifyPlaybackStateChange(message.getString("playbackState"));
-                    } else if ("GeckoView:MediaVolumeChanged".equals(event)) {
-                        element.notifyVolumeChange(message.getDouble("volume"), message.getBoolean("muted"));
-                    } else if ("GeckoView:MediaRateChanged".equals(event)) {
-                        element.notifyPlaybackRateChange(message.getDouble("rate"));
-                    } else if ("GeckoView:MediaFullscreenChanged".equals(event)) {
-                        element.notifyFullscreenChange(message.getBoolean("fullscreen"));
-                    } else if ("GeckoView:MediaRemove".equals(event)) {
-                        delegate.onMediaRemove(GeckoSession.this, element);
-                        mMediaElements.remove(element.getVideoId());
-                    } else if ("GeckoView:MediaError".equals(event)) {
-                        element.notifyError(message.getInt("code"));
-                    } else {
-                        throw new UnsupportedOperationException(event + " media message not implemented");
-                    }
-                }
-            };
-
-
     /* package */ int handlersCount;
 
     private final GeckoSessionHandler<?>[] mSessionHandlers = new GeckoSessionHandler<?>[] {
-        mContentHandler, mMediaHandler, mNavigationHandler, mProgressHandler, mScrollHandler,
+        mContentHandler, mNavigationHandler, mProgressHandler, mScrollHandler,
         mTrackingProtectionHandler, mPermissionHandler, mSelectionActionDelegate
     };
 
@@ -1671,24 +1595,6 @@ public class GeckoSession extends LayerSession
         mSelectionActionDelegate.setDelegate(delegate, this);
     }
 
-    /**
-     * Set the media callback handler.
-     * This will replace the current handler.
-     * @param delegate An implementation of MediaDelegate.
-     */
-    public void setMediaDelegate(final @Nullable MediaDelegate delegate) {
-        mMediaHandler.setDelegate(delegate, this);
-    }
-
-    /**
-     * Get the Media callback handler.
-     * @return The current Media callback handler.
-     */
-    public @Nullable MediaDelegate getMediaDelegate() {
-        return mMediaHandler.getDelegate();
-    }
-
-
     /**
      * Get the current selection action delegate for this GeckoSession.
      *
@@ -3598,22 +3504,4 @@ public class GeckoSession extends LayerSession
         void notifyAutoFill(@NonNull GeckoSession session, @AutoFillNotification int notification,
                             int virtualId);
     }
-
-    /**
-     * GeckoSession applications implement this interface to handle media events.
-     */
-    public interface MediaDelegate {
-        /**
-         * An HTMLMediaElement has been created.
-         * @param session Session instance.
-         * @param element The media element that was just created.
-         */
-        void onMediaAdd(GeckoSession session, MediaElement element);
-        /**
-         * An HTMLMediaElement has been unloaded.
-         * @param session Session instance.
-         * @param element The media element that was unloaded.
-         */
-        void onMediaRemove(GeckoSession session, MediaElement element);
-    }
 }
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
deleted file mode 100644
index 4563066d45a5..000000000000
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/MediaElement.java
+++ /dev/null
@@ -1,540 +0,0 @@
-/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
- * vim: ts=4 sw=4 expandtab:
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-package org.mozilla.geckoview;
-
-import android.support.annotation.IntDef;
-import android.support.annotation.Nullable;
-import android.util.Log;
-
-import org.mozilla.gecko.util.GeckoBundle;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * GeckoSession applications can use this class to handle media events
- * and control the HTMLMediaElement externally.
- **/
-public class MediaElement {
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({MEDIA_STATE_PLAY, MEDIA_STATE_PLAYING, MEDIA_STATE_PAUSE,
-             MEDIA_STATE_ENDED, MEDIA_STATE_SEEKING, MEDIA_STATE_SEEKED,
-             MEDIA_STATE_STALLED, MEDIA_STATE_SUSPEND, MEDIA_STATE_WAITING,
-             MEDIA_STATE_ABORT, MEDIA_STATE_EMPTIED})
-    /* package */ @interface MediaStateFlags {}
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({MEDIA_READY_STATE_HAVE_NOTHING, MEDIA_READY_STATE_HAVE_METADATA,
-             MEDIA_READY_STATE_HAVE_CURRENT_DATA, MEDIA_READY_STATE_HAVE_FUTURE_DATA,
-             MEDIA_READY_STATE_HAVE_ENOUGH_DATA})
-
-    /* package */ @interface ReadyStateFlags {}
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({MEDIA_ERROR_NETWORK_NO_SOURCE, MEDIA_ERROR_ABORTED, MEDIA_ERROR_NETWORK,
-             MEDIA_ERROR_DECODE, MEDIA_ERROR_SRC_NOT_SUPPORTED})
-    /* package */ @interface MediaErrorFlags {}
-
-    /**
-     * The media is no longer paused, as a result of the play method, or the autoplay attribute.
-     */
-    public static final int MEDIA_STATE_PLAY = 0;
-    /**
-     * Sent when the media has enough data to start playing, after the play event,
-     * but also when recovering from being stalled, when looping media restarts,
-     * and after seeked, if it was playing before seeking.
-     */
-    public static final int MEDIA_STATE_PLAYING = 1;
-    /**
-     * Sent when the playback state is changed to paused.
-     */
-    public static final int MEDIA_STATE_PAUSE = 2;
-    /**
-     * Sent when playback completes.
-     */
-    public static final int MEDIA_STATE_ENDED = 3;
-    /**
-     * Sent when a seek operation begins.
-     */
-    public static final int MEDIA_STATE_SEEKING = 4;
-    /**
-     * Sent when a seek operation completes.
-     */
-    public static final int MEDIA_STATE_SEEKED = 5;
-    /**
-     * Sent when the user agent is trying to fetch media data,
-     * but data is unexpectedly not forthcoming.
-     */
-    public static final int MEDIA_STATE_STALLED = 6;
-    /**
-     * Sent when loading of the media is suspended. This may happen either because
-     * the download has completed or because it has been paused for any other reason.
-     */
-    public static final int MEDIA_STATE_SUSPEND = 7;
-    /**
-     * Sent when the requested operation (such as playback) is delayed
-     * pending the completion of another operation (such as a seek).
-     */
-    public static final int MEDIA_STATE_WAITING = 8;
-    /**
-     * Sent when playback is aborted; for example, if the media is playing
-     * and is restarted from the beginning, this event is sent.
-     */
-    public static final int MEDIA_STATE_ABORT = 9;
-    /**
-     * The media has become empty. For example, this event is sent if the media
-     * has already been loaded, and the load() method is called to reload it.
-     */
-    public static final int MEDIA_STATE_EMPTIED = 10;
-
-
-    /**
-     * No information is available about the media resource.
-     */
-    public static final int MEDIA_READY_STATE_HAVE_NOTHING = 0;
-    /**
-     * Enough of the media resource has been retrieved that the metadata
-     * attributes are available.
-     */
-    public static final int MEDIA_READY_STATE_HAVE_METADATA = 1;
-    /**
-     * Data is available for the current playback position,
-     * but not enough to actually play more than one frame.
-     */
-    public static final int MEDIA_READY_STATE_HAVE_CURRENT_DATA = 2;
-    /**
-     * Data for the current playback position as well as for at least a little
-     * bit of time into the future is available.
-     */
-    public static final int MEDIA_READY_STATE_HAVE_FUTURE_DATA = 3;
-    /**
-     * Enough data is available—and the download rate is high enough that the media
-     * can be played through to the end without interruption.
-     */
-    public static final int MEDIA_READY_STATE_HAVE_ENOUGH_DATA = 4;
-
-
-    /**
-     * Media source not found or unable to select any of the child elements
-     * for playback during resource selection.
-     */
-    public static final int MEDIA_ERROR_NETWORK_NO_SOURCE = 0;
-    /**
-     * The fetching of the associated resource was aborted by the user's request.
-     */
-    public static final int MEDIA_ERROR_ABORTED = 1;
-    /**
-     * Some kind of network error occurred which prevented the media from being
-     * successfully fetched, despite having previously been available.
-     */
-    public static final int MEDIA_ERROR_NETWORK = 2;
-    /**
-     * Despite having previously been determined to be usable,
-     * an error occurred while trying to decode the media resource, resulting in an error.
-     */
-    public static final int MEDIA_ERROR_DECODE = 3;
-    /**
-     * The associated resource or media provider object has been found to be unsuitable.
-     */
-    public static final int MEDIA_ERROR_SRC_NOT_SUPPORTED = 4;
-
-    /**
-     * Data class with the Metadata associated to a Media Element.
-     **/
-    public static class Metadata {
-        /**
-         * Contains the current media source URI.
-         */
-        public final String currentSource;
-
-        /**
-         * Indicates the duration of the media in seconds.
-         */
-        public final double duration;
-
-        /**
-         * Indicates the width of the video in device pixels.
-         */
-        public final long width;
-
-        /**
-         * Indicates the height of the video in device pixels.
-         */
-        public final long height;
-
-        /**
-         * Indicates if seek operations are compatible with the media.
-         */
-        public final boolean isSeekable;
-
-        /**
-         * Indicates the number of audio tracks included in the media.
-         */
-        public final int audioTrackCount;
-
-        /**
-         * Indicates the number of video tracks included in the media.
-         */
-        public final int videoTrackCount;
-
-        /* package */ Metadata(final GeckoBundle bundle) {
-            currentSource = bundle.getString("src", "");
-            duration = bundle.getDouble("duration", 0);
-            width = bundle.getLong("width", 0);
-            height = bundle.getLong("height", 0);
-            isSeekable = bundle.getBoolean("seekable", false);
-            audioTrackCount = bundle.getInt("audioTrackCount", 0);
-            videoTrackCount = bundle.getInt("videoTrackCount", 0);
-        }
-    }
-
-    /**
-     * Data class that indicates infomation about a media load progress event.
-     **/
-    public static class LoadProgressInfo {
-        /*
-         * Class used to represent a set of time ranges.
-         */
-        public class TimeRange {
-            /* package */ TimeRange(double start, double end) {
-                this.start = start;
-                this.end = end;
-            }
-            /*
-             * The start time of the range in seconds.
-             */
-            public final double start;
-            /*
-             * The end time of the range in seconds.
-             */
-            public final double end;
-        }
-
-        /**
-         * The number of bytes transferred since the beginning of the operation
-         * or -1 if the data is not computable.
-         */
-        public final long loadedBytes;
-
-        /**
-         * The total number of bytes of content that will be transferred during the operation
-         * or -1 if the data is not computable.
-         */
-        public final long totalBytes;
-
-        /**
-         * The ranges of the media source that the browser has currently buffered.
-         * Null if the browser has not buffered any time range or the data is not computable.
-         */
-        public final @Nullable TimeRange[] buffered;
-
-        /* package */ LoadProgressInfo(final GeckoBundle bundle) {
-            loadedBytes = bundle.getLong("loadedBytes", -1);
-            totalBytes = bundle.getLong("loadedBytes", -1);
-            double[] starts = bundle.getDoubleArray("timeRangeStarts");
-            double[] ends = bundle.getDoubleArray("timeRangeEnds");
-            if (starts == null || ends == null) {
-                buffered = null;
-                return;
-            }
-
-            if (starts.length != ends.length) {
-                throw new AssertionError("timeRangeStarts and timeRangeEnds length do not match");
-            }
-
-            buffered = new TimeRange[starts.length];
-            for (int i = 0; i < starts.length; ++i) {
-                buffered[i] = new TimeRange(starts[i], ends[i]);
-            }
-        }
-    }
-
-    /**
-     * This interface allows apps to handle media events.
-     **/
-    public interface Delegate {
-        /**
-         * The media playback state has changed.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param mediaState The playback state of the media.
-         *                   One of the {@link #MEDIA_STATE_PLAY MEDIA_STATE_*} flags.
-         */
-        default void onPlaybackStateChange(MediaElement mediaElement, @MediaStateFlags int mediaState) {}
-
-        /**
-         * The readiness state of the media has changed.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param readyState The readiness state of the media.
-         *                   One of the {@link #MEDIA_READY_STATE_HAVE_NOTHING MEDIA_READY_STATE_*} flags.
-         */
-        default void onReadyStateChange(MediaElement mediaElement, @ReadyStateFlags int readyState) {}
-
-        /**
-         * The media metadata has loaded or changed.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param metaData The MetaData values of the media.
-         */
-        default void onMetadataChange(MediaElement mediaElement, Metadata metaData) {}
-
-        /**
-         * Indicates that a loading operation is in progress for the media.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param progressInfo Information about the load progress and buffered ranges.
-         */
-        default void onLoadProgress(MediaElement mediaElement, LoadProgressInfo progressInfo) {}
-
-        /**
-         * The media audio volume has changed.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param volume The volume of the media.
-         * @param muted True if the media is muted.
-         */
-        default void onVolumeChange(MediaElement mediaElement, double volume, boolean muted) {}
-
-        /**
-         * The current playback time has changed. This event is usually dispatched every 250ms.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param time The current playback time in seconds.
-         */
-        default void onTimeChange(MediaElement mediaElement, double time) {}
-
-        /**
-         * The media playback speed has changed.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param rate The current playback rate. A value of 1.0 indicates normal speed.
-         */
-        default void onPlaybackRateChange(MediaElement mediaElement, double rate) {}
-
-        /**
-         * A media element has entered or exited fullscreen mode.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param fullscreen True if the media has entered full screen mode.
-         */
-        default void onFullscreenChange(MediaElement mediaElement, boolean fullscreen) {}
-
-        /**
-         * An error has occurred.
-         *
-         * @param mediaElement A reference to the MediaElement that dispatched the event.
-         * @param errorCode The error code.
-         *                  One of the {@link #MEDIA_ERROR_NETWORK_NO_SOURCE MEDIA_ERROR_*} flags.
-         */
-        default void onError(MediaElement mediaElement, @MediaErrorFlags int errorCode) {}
-    }
-
-    /* package */ long getVideoId() {
-        return mVideoId;
-    }
-
-    /**
-     * Gets the current the media callback handler.
-     *
-     * @return the current media callback handler.
-     */
-    public @Nullable MediaElement.Delegate getDelegate() {
-        return mDelegate;
-    }
-
-    /**
-     * Sets the media callback handler.
-     * This will replace the current handler.
-     *
-     * @param delegate An implementation of MediaDelegate.
-     */
-    public void setDelegate(final @Nullable MediaElement.Delegate delegate) {
-        if (mDelegate == delegate) {
-            return;
-        }
-        MediaElement.Delegate oldDelegate = mDelegate;
-        mDelegate = delegate;
-        if (oldDelegate != null && mDelegate == null) {
-            mSession.getEventDispatcher().dispatch("GeckoView:MediaUnobserve", createMessage());
-            mSession.getMediaElements().remove(mVideoId);
-        } else if (oldDelegate == null) {
-            mSession.getMediaElements().put(mVideoId, this);
-            mSession.getEventDispatcher().dispatch("GeckoView:MediaObserve", createMessage());
-        }
-    }
-
-    /**
-     * Pauses the media.
-     */
-    public void pause() {
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaPause", createMessage());
-    }
-
-    /**
-     * Plays the media.
-     */
-    public void play() {
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaPlay", createMessage());
-    }
-
-    /**
-     * Seek the media to a given time.
-     *
-     * @param time Seek time in seconds.
-     */
-    public void seek(final double time) {
-        final GeckoBundle message = createMessage();
-        message.putDouble("time", time);
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaSeek", message);
-    }
-
-    /**
-     * Set the volume at which the media will be played.
-     *
-     * @param volume A Volume value. It must fall between 0 and 1, where 0 is effectively muted
-     *               and 1 is the loudest possible value.
-     */
-    public void setVolume(final double volume) {
-        final GeckoBundle message = createMessage();
-        message.putDouble("volume", volume);
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetVolume", message);
-    }
-
-    /**
-     * Mutes the media.
-     *
-     * @param muted True in order to mute the audio.
-     */
-    public void setMuted(final boolean muted) {
-        final GeckoBundle message = createMessage();
-        message.putBoolean("muted", muted);
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetMuted", message);
-    }
-
-    /**
-     * Sets the playback rate at which the media will be played.
-     *
-     * @param playbackRate The rate at which the media will be played.
-     *                     A value of 1.0 indicates normal speed.
-     */
-    public void setPlaybackRate(final double playbackRate) {
-        final GeckoBundle message = createMessage();
-        message.putDouble("playbackRate", playbackRate);
-        mSession.getEventDispatcher().dispatch("GeckoView:MediaSetPlaybackRate", message);
-    }
-
-    // Helper methods used for event observers to update the current video state
-
-    /* package */ void notifyPlaybackStateChange(final String event) {
-        @MediaStateFlags int state;
-        switch (event.toLowerCase()) {
-            case "play":
-                state = MEDIA_STATE_PLAY;
-                break;
-            case "playing":
-                state = MEDIA_STATE_PLAYING;
-                break;
-            case "pause":
-                state = MEDIA_STATE_PAUSE;
-                break;
-            case "ended":
-                state = MEDIA_STATE_ENDED;
-                break;
-            case "seeking":
-                state = MEDIA_STATE_SEEKING;
-                break;
-            case "seeked":
-                state = MEDIA_STATE_SEEKED;
-                break;
-            case "stalled":
-                state = MEDIA_STATE_STALLED;
-                break;
-            case "suspend":
-                state = MEDIA_STATE_SUSPEND;
-                break;
-            case "waiting":
-                state = MEDIA_STATE_WAITING;
-                break;
-            case "abort":
-                state = MEDIA_STATE_ABORT;
-                break;
-            case "emptied":
-                state = MEDIA_STATE_EMPTIED;
-                break;
-            default:
-                throw new UnsupportedOperationException(event + " HTMLMediaElement event not implemented");
-        }
-
-        if (mDelegate != null) {
-            mDelegate.onPlaybackStateChange(this, state);
-        }
-    }
-
-    /* package */ void notifyReadyStateChange(final int readyState) {
-        if (mDelegate != null) {
-            mDelegate.onReadyStateChange(this, readyState);
-        }
-    }
-
-    /* package */ void notifyLoadProgress(final GeckoBundle message) {
-        if (mDelegate != null) {
-            mDelegate.onLoadProgress(this, new LoadProgressInfo(message));
-        }
-    }
-
-    /* package */ void notifyTimeChange(final double currentTime) {
-        if (mDelegate != null) {
-            mDelegate.onTimeChange(this, currentTime);
-        }
-    }
-
-    /* package */ void notifyVolumeChange(final double volume, final boolean muted) {
-        if (mDelegate != null) {
-            mDelegate.onVolumeChange(this, volume, muted);
-        }
-    }
-
-    /* package */ void notifyPlaybackRateChange(final double rate) {
-        if (mDelegate != null) {
-            mDelegate.onPlaybackRateChange(this, rate);
-        }
-    }
-
-    /* package */ void notifyMetadataChange(final GeckoBundle message) {
-        if (mDelegate != null) {
-            mDelegate.onMetadataChange(this, new Metadata(message));
-        }
-    }
-
-    /* package */ void notifyFullscreenChange(final boolean fullscreen) {
-        if (mDelegate != null) {
-            mDelegate.onFullscreenChange(this, fullscreen);
-        }
-    }
-
-    /* package */ void notifyError(final int aCode) {
-        if (mDelegate != null) {
-            mDelegate.onError(this, aCode);
-        }
-    }
-
-    private GeckoBundle createMessage() {
-        final GeckoBundle bundle = new GeckoBundle();
-        bundle.putLong("id", mVideoId);
-        return bundle;
-    }
-
-    /* package */ MediaElement(final long videoId, final GeckoSession session) {
-        mVideoId = videoId;
-        mSession = session;
-    }
-
-    final protected GeckoSession mSession;
-    final protected long mVideoId;
-    protected MediaElement.Delegate mDelegate;
-}
diff --git a/mobile/android/modules/geckoview/GeckoViewMedia.jsm b/mobile/android/modules/geckoview/GeckoViewMedia.jsm
deleted file mode 100644
index 005c0120a8eb..000000000000
--- a/mobile/android/modules/geckoview/GeckoViewMedia.jsm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-"use strict";
-
-var EXPORTED_SYMBOLS = ["GeckoViewMedia"];
-
-ChromeUtils.import("resource://gre/modules/GeckoViewModule.jsm");
-
-class GeckoViewMedia extends GeckoViewModule {
-  onEnable() {
-    this.registerListener([
-      "GeckoView:MediaObserve",
-      "GeckoView:MediaUnobserve",
-      "GeckoView:MediaPlay",
-      "GeckoView:MediaPause",
-      "GeckoView:MediaSeek",
-      "GeckoView:MediaSetVolume",
-      "GeckoView:MediaSetMuted",
-      "GeckoView:MediaSetPlaybackRate",
-    ]);
-  }
-
-  onDisable() {
-    this.unregisterListener();
-  }
-
-  onEvent(aEvent, aData, aCallback) {
-    debug `onEvent: event=${aEvent}, data=${aData}`;
-    this.messageManager.sendAsyncMessage(aEvent, aData);
-  }
-}
diff --git a/mobile/android/modules/geckoview/moz.build b/mobile/android/modules/geckoview/moz.build
index 8841c7866aa5..673a3fae1562 100644
--- a/mobile/android/modules/geckoview/moz.build
+++ b/mobile/android/modules/geckoview/moz.build
@@ -12,7 +12,6 @@ EXTRA_JS_MODULES += [
     'GeckoViewChildModule.jsm',
     'GeckoViewConsole.jsm',
     'GeckoViewContent.jsm',
-    'GeckoViewMedia.jsm',
     'GeckoViewModule.jsm',
     'GeckoViewNavigation.jsm',
     'GeckoViewProgress.jsm',

From 597ba3e7d06c95cc73045a1b77bc4fcbf06843db Mon Sep 17 00:00:00 2001
From: Drew Willcoxon <adw@mozilla.com>
Date: Thu, 8 Nov 2018 23:50:31 +0000
Subject: [PATCH 60/77] Bug 1499193 - Follow-up: Update metadata for the
 SEARCH_COUNTS keyed histogram. r=mkaply

Differential Revision: https://phabricator.services.mozilla.com/D11382

--HG--
extra : moz-landing-system : lando
---
 toolkit/components/telemetry/Histograms.json           | 4 +++-
 toolkit/components/telemetry/histogram-whitelists.json | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index 57cd111089bc..ebc5d7739e5f 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -7998,7 +7998,9 @@
     "kind": "count",
     "keyed": true,
     "releaseChannelCollection": "opt-out",
-    "description": "Records search counts for search access points and in content searches. For search access points, the format is: <engine-name>.<search-access-point> For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
+    "alert_emails": ["adw@mozilla.com"],
+    "bug_numbers": [1089670, 1482158, 1499193],
+    "description": "Records search counts for search access points and in content searches. For search access points in general and for the urlbar when an internal @engine shorcut is not used, the format is: <engine-name>.<search-access-point> For the urlbar when an internal @engine shortcut is used, the format is: <engine-name>.<@engine>.urlbar For in content searches, the format is <provider>.in-content:[sap|sap-follow-on|organic]:[code|none]"
   },
   "SEARCH_RESET_RESULT": {
     "record_in_processes": ["main", "content"],
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index 42ec5809d5e2..72eee37eee38 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -397,7 +397,6 @@
     "PWMGR_USERNAME_PRESENT",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "SAFE_MODE_USAGE",
-    "SEARCH_COUNTS",
     "SERVICE_WORKER_CONTROLLED_DOCUMENTS",
     "SERVICE_WORKER_LIFE_TIME",
     "SERVICE_WORKER_REGISTRATIONS",
@@ -983,7 +982,6 @@
     "REFRESH_DRIVER_TICK",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "SAFE_MODE_USAGE",
-    "SEARCH_COUNTS",
     "SEARCH_SERVICE_COUNTRY_FETCH_CAUSED_SYNC_INIT",
     "SEARCH_SERVICE_COUNTRY_FETCH_RESULT",
     "SEARCH_SERVICE_COUNTRY_FETCH_TIME_MS",

From 8802c6702049bdfbc768ad8f842a54c51339fd82 Mon Sep 17 00:00:00 2001
From: Tom Prince <mozilla@hocat.ca>
Date: Thu, 8 Nov 2018 23:10:15 +0000
Subject: [PATCH 61/77] No bug: [try-staging] Add support for
 early-to-late-beta migration; r=aryx

Differential Revision: https://phabricator.services.mozilla.com/D11393

--HG--
extra : moz-landing-system : lando
---
 .../mozharness/configs/merge_day/early_to_late_beta.py   | 9 +++++++++
 tools/tryselect/selectors/release.py                     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 testing/mozharness/configs/merge_day/early_to_late_beta.py

diff --git a/testing/mozharness/configs/merge_day/early_to_late_beta.py b/testing/mozharness/configs/merge_day/early_to_late_beta.py
new file mode 100644
index 000000000000..7738fa1e9c1a
--- /dev/null
+++ b/testing/mozharness/configs/merge_day/early_to_late_beta.py
@@ -0,0 +1,9 @@
+# This config is for `mach try release` to support beta simulations.
+
+config = {
+    'replacements': [
+        ('build/defines.sh',
+         'EARLY_BETA_OR_EARLIER=1',
+         'EARLY_BETA_OR_EARLIER='),
+    ],
+}
diff --git a/tools/tryselect/selectors/release.py b/tools/tryselect/selectors/release.py
index ff717bdb765e..ff3c486ce3ed 100644
--- a/tools/tryselect/selectors/release.py
+++ b/tools/tryselect/selectors/release.py
@@ -37,7 +37,7 @@ class ReleaseParser(BaseTryParser):
          {'metavar': 'STR',
           'action': 'append',
           'dest': 'migrations',
-          'choices': ['central-to-beta', 'beta-to-release'],
+          'choices': ['central-to-beta', 'beta-to-release', 'early-to-late-beta'],
           'help': "Migration to run for the release (can be specified multiple times).",
           }],
         [['--no-limit-locales'],

From fbda00589de2163cc9e74402de351c26532470c2 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:19:20 +0000
Subject: [PATCH 62/77] Bug 1496864 - Cause exceptions thrown while running an
 APZ test continuation to fail the test. r=kats

Otherwise, the exception is just silently swallowed by typical test invocation
code like:

  waitUntilApzStable()
  .then(runContinuation(test))
  .then(subtestDone);

Differential Revision: https://phabricator.services.mozilla.com/D11225

--HG--
extra : moz-landing-system : lando
---
 gfx/layers/apz/test/mochitest/apz_test_utils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gfx/layers/apz/test/mochitest/apz_test_utils.js b/gfx/layers/apz/test/mochitest/apz_test_utils.js
index 218d126e81b7..76339696e92d 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_utils.js
@@ -438,7 +438,11 @@ function runContinuation(testFunction) {
         }
       }
 
-      driveTest();
+      try {
+        driveTest();
+      } catch (ex) {
+        SimpleTest.ok(false, "APZ test continuation failed with exception: " + ex);
+      }
     });
   };
 }

From e6ab7de2b5cc5342437841223e52c5382ba345df Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:35 +0000
Subject: [PATCH 63/77] Bug 1496864 - Have some apz_test_native_event_utils
 functions accept a window as an event target, as an alternative to an
 element. r=kats

Sometimes, it's easier for the caller to express the input coordinates
relative to the window, rather than relative to any element's origin,
particularly in cases where you're zoomed in and the origin of e.g.
the document element can be far away from the window origin.

This patch also changes an existing test (helper_zoomed_pan.html) to take
advantage of this, and use the window as the target of the events it
generates. This becomes important with the next patch, where continuing
to use the element as the target would require a manual adjustment to
account for scrolling that has taken place.

Differential Revision: https://phabricator.services.mozilla.com/D11226

--HG--
extra : moz-landing-system : lando
---
 .../mochitest/apz_test_native_event_utils.js  | 45 +++++++++++++------
 .../apz/test/mochitest/helper_zoomed_pan.html |  3 +-
 2 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
index c83267509bc0..6ed4357c26ff 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@@ -78,12 +78,29 @@ function nativeMouseUpEventMsg() {
   throw "Native mouse-up events not supported on platform " + getPlatform();
 }
 
-// Convert (aX, aY), in CSS pixels relative to aElement's bounding rect,
+// Given an event target which may be a window or an element, get the associated window.
+function windowForTarget(aTarget) {
+  if (aTarget instanceof Window) {
+    return aTarget;
+  }
+  return aTarget.ownerDocument.defaultView;
+}
+
+// Several event sythesization functions below (and their helpers) take a "target" 
+// parameter which may be either an element or a window. For such functions,
+// the target's "bounding rect" refers to the bounding client rect for an element,
+// and the window's origin for a window.
+// Not all functions have been "upgraded" to allow a window argument yet; feel
+// free to upgrade others as necessary.
+
+// Convert (aX, aY), in CSS pixels relative to aTarget's bounding rect
 // to device pixels relative to the screen.
-function coordinatesRelativeToScreen(aX, aY, aElement) {
-  var targetWindow = aElement.ownerDocument.defaultView;
+function coordinatesRelativeToScreen(aX, aY, aTarget) {
+  var targetWindow = windowForTarget(aTarget);
   var scale = targetWindow.devicePixelRatio;
-  var rect = aElement.getBoundingClientRect();
+  var rect = (aTarget instanceof Window)
+    ? {left: 0, top: 0} /* we don't use the width or height */
+    : aTarget.getBoundingClientRect();
   return {
     x: (targetWindow.mozInnerScreenX + rect.left + aX) * scale,
     y: (targetWindow.mozInnerScreenY + rect.top + aY) * scale
@@ -186,16 +203,16 @@ function synthesizeNativeMouseMoveAndWaitForMoveEvent(aElement, aX, aY, aCallbac
 }
 
 // Synthesizes a native touch event and dispatches it. aX and aY in CSS pixels
-// relative to the top-left of |aElement|'s bounding rect.
-function synthesizeNativeTouch(aElement, aX, aY, aType, aObserver = null, aTouchId = 0) {
-  var pt = coordinatesRelativeToScreen(aX, aY, aElement);
-  var utils = SpecialPowers.getDOMWindowUtils(aElement.ownerDocument.defaultView);
+// relative to the top-left of |aTarget|'s bounding rect.
+function synthesizeNativeTouch(aTarget, aX, aY, aType, aObserver = null, aTouchId = 0) {
+  var pt = coordinatesRelativeToScreen(aX, aY, aTarget);
+  var utils = SpecialPowers.getDOMWindowUtils(windowForTarget(aTarget));
   utils.sendNativeTouchPoint(aTouchId, aType, pt.x, pt.y, 1, 90, aObserver);
   return true;
 }
 
 // Function to generate native touch events for a multi-touch sequence.
-// aElement is the element whose bounding rect the coordinates are relative to.
+// aTarget is the element or window whose bounding rect the coordinates are relative to.
 // aPositions is a 2D array of position data. It is indexed as [row][column],
 //   where advancing the row counter moves forward in time, and each column
 //   represents a single "finger" (or touch input). Each row must have exactly
@@ -212,7 +229,7 @@ function synthesizeNativeTouch(aElement, aX, aY, aType, aObserver = null, aTouch
 // aObserver is the observer that will get registered on the very last
 //   synthesizeNativeTouch call this function makes.
 // aTouchIds is an array holding the touch ID values of each "finger".
-function* synthesizeNativeTouchSequences(aElement, aPositions, aObserver = null, aTouchIds = [0]) {
+function* synthesizeNativeTouchSequences(aTarget, aPositions, aObserver = null, aTouchIds = [0]) {
   // We use lastNonNullValue to figure out which synthesizeNativeTouch call
   // will be the last one we make, so that we can register aObserver on it.
   var lastNonNullValue = -1;
@@ -268,11 +285,11 @@ function* synthesizeNativeTouchSequences(aElement, aPositions, aObserver = null,
           // make, pass the observer as well
           var thisIndex = ((i - yields) * aTouchIds.length) + j;
           var observer = (lastSynthesizeCall == thisIndex) ? aObserver : null;
-          synthesizeNativeTouch(aElement, currentPositions[j].x, currentPositions[j].y, SpecialPowers.DOMWindowUtils.TOUCH_REMOVE, observer, aTouchIds[j]);
+          synthesizeNativeTouch(aTarget, currentPositions[j].x, currentPositions[j].y, SpecialPowers.DOMWindowUtils.TOUCH_REMOVE, observer, aTouchIds[j]);
           currentPositions[j] = null;
         }
       } else {
-        synthesizeNativeTouch(aElement, aPositions[i][j].x, aPositions[i][j].y, SpecialPowers.DOMWindowUtils.TOUCH_CONTACT, null, aTouchIds[j]);
+        synthesizeNativeTouch(aTarget, aPositions[i][j].x, aPositions[i][j].y, SpecialPowers.DOMWindowUtils.TOUCH_CONTACT, null, aTouchIds[j]);
         currentPositions[j] = aPositions[i][j];
       }
     }
@@ -283,7 +300,7 @@ function* synthesizeNativeTouchSequences(aElement, aPositions, aObserver = null,
 // Note that when calling this function you'll want to make sure that the pref
 // "apz.touch_start_tolerance" is set to 0, or some of the touchmove will get
 // consumed to overcome the panning threshold.
-function synthesizeNativeTouchDrag(aElement, aX, aY, aDeltaX, aDeltaY, aObserver = null, aTouchId = 0) {
+function synthesizeNativeTouchDrag(aTarget, aX, aY, aDeltaX, aDeltaY, aObserver = null, aTouchId = 0) {
   var steps = Math.max(Math.abs(aDeltaX), Math.abs(aDeltaY));
   var positions = new Array();
   positions.push([{ x: aX, y: aY }]);
@@ -294,7 +311,7 @@ function synthesizeNativeTouchDrag(aElement, aX, aY, aDeltaX, aDeltaY, aObserver
     positions.push([pos]);
   }
   positions.push([{ x: aX + aDeltaX, y: aY + aDeltaY }]);
-  var continuation = synthesizeNativeTouchSequences(aElement, positions, aObserver, [aTouchId]);
+  var continuation = synthesizeNativeTouchSequences(aTarget, positions, aObserver, [aTouchId]);
   var yielded = continuation.next();
   while (!yielded.done) {
     yielded = continuation.next();
diff --git a/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html b/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
index c989d3165576..dffdce5e129e 100644
--- a/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
+++ b/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
@@ -39,7 +39,6 @@
     }
 
     function* test(testDriver) {
-      const target = document.getElementById("content");
       const cases = [
         {
           x: 0,
@@ -64,7 +63,7 @@
       ];
 
       for (let c of cases) {
-        yield synthesizeNativeTouchDrag(target,
+        yield synthesizeNativeTouchDrag(window,
                                         c.x,
                                         c.y,
                                         c.dx(document.documentElement.clientWidth),

From 1722841caf066f632ef81f2c609b0b561c45b0c9 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:39 +0000
Subject: [PATCH 64/77] Bug 1496864 - Convert coordinates to be relative to the
 visual viewport in coordinatesRelativeToScreen(). r=kats

This is necessary for correctness because the callers pass the resulting
coordinates to nsIDOMWindowUtils native event sythesization functions,
which interpret the event coordinates as being relative to the screen.

Differential Revision: https://phabricator.services.mozilla.com/D11227

--HG--
extra : moz-landing-system : lando
---
 .../test/mochitest/apz_test_native_event_utils.js    | 12 +++++++++++-
 gfx/layers/apz/test/mochitest/helper_bug1280013.html | 12 +++++-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
index 6ed4357c26ff..181f2af8c952 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@@ -86,6 +86,16 @@ function windowForTarget(aTarget) {
   return aTarget.ownerDocument.defaultView;
 }
 
+function getBoundingClientRectRelativeToVisualViewport(aElement) {
+  let utils = SpecialPowers.getDOMWindowUtils(window);
+  var rect = aElement.getBoundingClientRect();
+  var offsetX = {}, offsetY = {};
+  utils.getVisualViewportOffsetRelativeToLayoutViewport(offsetX, offsetY);
+  rect.x -= offsetX.value;
+  rect.y -= offsetY.value;
+  return rect;
+}
+
 // Several event sythesization functions below (and their helpers) take a "target" 
 // parameter which may be either an element or a window. For such functions,
 // the target's "bounding rect" refers to the bounding client rect for an element,
@@ -100,7 +110,7 @@ function coordinatesRelativeToScreen(aX, aY, aTarget) {
   var scale = targetWindow.devicePixelRatio;
   var rect = (aTarget instanceof Window)
     ? {left: 0, top: 0} /* we don't use the width or height */
-    : aTarget.getBoundingClientRect();
+    : getBoundingClientRectRelativeToVisualViewport(aTarget);
   return {
     x: (targetWindow.mozInnerScreenX + rect.left + aX) * scale,
     y: (targetWindow.mozInnerScreenY + rect.top + aY) * scale
diff --git a/gfx/layers/apz/test/mochitest/helper_bug1280013.html b/gfx/layers/apz/test/mochitest/helper_bug1280013.html
index 12b4bc7e93dc..8a9a6552cc73 100644
--- a/gfx/layers/apz/test/mochitest/helper_bug1280013.html
+++ b/gfx/layers/apz/test/mochitest/helper_bug1280013.html
@@ -23,9 +23,9 @@ function* test(testDriver) {
   // notification) resumes the test.
 
   // Scroll down to the iframe. Do it in two drags instead of one in case the
-  // device screen is short
-  yield synthesizeNativeTouchDrag(document.body, 10, 400, 0, -350);
-  yield synthesizeNativeTouchDrag(document.body, 10, 400, 0, -350);
+  // device screen is short.
+  yield synthesizeNativeTouchDrag(window, 10, 400, 0, -350);
+  yield synthesizeNativeTouchDrag(window, 10, 400, 0, -350);
   // Now the top of the visible area should be at y=700 of the top-level page,
   // so if the screen is >= 500px tall, the entire iframe should be visible, at
   // least vertically.
@@ -37,11 +37,9 @@ function* test(testDriver) {
   yield flushApzRepaints(testDriver);
   is(window.scrollY, 0, "Main-thread scroll position is still at 0");
 
-  // Scroll the iframe by 300px. Note that since the main-thread scroll position
-  // is still 0, the subframe's getBoundingClientRect is going to be off by
-  // 700 pixels, so we compensate for that here.
+  // Scroll the iframe by 300px.
   var subframe = document.getElementById('subframe');
-  yield synthesizeNativeTouchDrag(subframe, 10, 200 - 700, 0, -300);
+  yield synthesizeNativeTouchDrag(subframe, 10, 200, 0, -300);
 
   // Remove the observer, we don't need it any more.
   SpecialPowers.Services.obs.removeObserver(testDriver, "APZ:TransformEnd", false);

From 52ee4ae5bf95c581e4c4040a3e1415ea875985c8 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:44 +0000
Subject: [PATCH 65/77] Bug 1496864 - When performing a main thread scroll,
 update the main thread's view of the visual viewport offset right away.
 r=kats

Differential Revision: https://phabricator.services.mozilla.com/D11228

--HG--
extra : moz-landing-system : lando
---
 layout/generic/nsGfxScrollFrame.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp
index 10e0356b06aa..2b557eda342d 100644
--- a/layout/generic/nsGfxScrollFrame.cpp
+++ b/layout/generic/nsGfxScrollFrame.cpp
@@ -2948,12 +2948,19 @@ ScrollFrameHelper::ScrollToImpl(nsPoint aPt, const nsRect& aRange, nsAtom* aOrig
   // the RCD-RSF this will have the effect of resetting the visual viewport
   // offset to be the same as the new scroll (= layout viewport) offset.
   // The APZ callback transform, which reflects the difference between these
-  // offsets, will subsequently be cleared. However, it we wait for APZ to
+  // offsets, will subsequently be cleared. However, if we wait for APZ to
   // clear it, the main thread could end up using the old value and get
   // incorrect results, so just clear it now.
   if (mIsRoot && nsLayoutUtils::CanScrollOriginClobberApz(mLastScrollOrigin)) {
     content->SetProperty(nsGkAtoms::apzCallbackTransform, new CSSPoint(),
                          nsINode::DeleteProperty<CSSPoint>);
+
+    // Similarly, update the main thread's view of the visual viewport
+    // offset. Otherwise, if we perform calculations that depend on this
+    // offset (e.g. by using nsIDOMWindowUtils.getVisualViewportOffset()
+    // in chrome JS code) before it's updated by the next APZ repaint,
+    // we could get incorrect results.
+    presContext->PresShell()->SetVisualViewportOffset(pt);
   }
 
   ScrollVisual();

From 52296004c44c02fa8dae34420c0754cdeb739287 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:48 +0000
Subject: [PATCH 66/77] Bug 1496864 - Move getResolution() into
 apz_test_native_utils.js. r=kats

Differential Revision: https://phabricator.services.mozilla.com/D11229

--HG--
extra : moz-landing-system : lando
---
 .../apz/test/mochitest/apz_test_native_event_utils.js       | 6 ++++++
 .../apz/test/mochitest/helper_basic_doubletap_zoom.html     | 5 -----
 gfx/layers/apz/test/mochitest/helper_basic_zoom.html        | 5 -----
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
index 181f2af8c952..a8247ed81b7b 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@@ -1,5 +1,11 @@
 // Utilities for synthesizing of native events.
 
+function getResolution() {
+  let resolution = { value: -1 }; // bogus value in case DWU fails us
+  SpecialPowers.getDOMWindowUtils(window).getResolution(resolution);
+  return resolution.value;
+}
+
 function getPlatform() {
   if (navigator.platform.indexOf("Win") == 0) {
     return "windows";
diff --git a/gfx/layers/apz/test/mochitest/helper_basic_doubletap_zoom.html b/gfx/layers/apz/test/mochitest/helper_basic_doubletap_zoom.html
index c8e5c4588793..0b220c9bddee 100644
--- a/gfx/layers/apz/test/mochitest/helper_basic_doubletap_zoom.html
+++ b/gfx/layers/apz/test/mochitest/helper_basic_doubletap_zoom.html
@@ -8,11 +8,6 @@
   <script type="application/javascript" src="apz_test_utils.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
-function getResolution() {
-  let resolution = { value: -1 }; // bogus value in case DWU fails us
-  SpecialPowers.getDOMWindowUtils(window).getResolution(resolution);
-  return resolution.value;
-}
 
 function* test(testDriver) {
   var initial_resolution = getResolution();
diff --git a/gfx/layers/apz/test/mochitest/helper_basic_zoom.html b/gfx/layers/apz/test/mochitest/helper_basic_zoom.html
index 02bf4375301f..af6426ee9348 100644
--- a/gfx/layers/apz/test/mochitest/helper_basic_zoom.html
+++ b/gfx/layers/apz/test/mochitest/helper_basic_zoom.html
@@ -8,11 +8,6 @@
   <script type="application/javascript" src="apz_test_utils.js"></script>
   <script type="application/javascript" src="/tests/SimpleTest/paint_listener.js"></script>
   <script type="application/javascript">
-function getResolution() {
-  let resolution = { value: -1 }; // bogus value in case DWU fails us
-  SpecialPowers.getDOMWindowUtils(window).getResolution(resolution);
-  return resolution.value;
-}
 
 function* test(testDriver) {
   var initial_resolution = getResolution();

From c3861fadd7c52148ccaf80744d684a534f8e0270 Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:52 +0000
Subject: [PATCH 67/77] Bug 1496864 - Take the resolution into account in
 coordinatesRelativeToScreen(). r=kats

This is again necessary for correctness as the nsIDOMWindowUtils.sendNative*
functions take coordinates in screen units which include the resolution.

Differential Revision: https://phabricator.services.mozilla.com/D11230

--HG--
extra : moz-landing-system : lando
---
 .../apz/test/mochitest/apz_test_native_event_utils.js    | 9 ++++++---
 gfx/layers/apz/test/mochitest/helper_zoomed_pan.html     | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
index a8247ed81b7b..155ac9551a52 100644
--- a/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
+++ b/gfx/layers/apz/test/mochitest/apz_test_native_event_utils.js
@@ -113,13 +113,16 @@ function getBoundingClientRectRelativeToVisualViewport(aElement) {
 // to device pixels relative to the screen.
 function coordinatesRelativeToScreen(aX, aY, aTarget) {
   var targetWindow = windowForTarget(aTarget);
-  var scale = targetWindow.devicePixelRatio;
+  var deviceScale = targetWindow.devicePixelRatio;
+  var resolution = getResolution();
   var rect = (aTarget instanceof Window)
     ? {left: 0, top: 0} /* we don't use the width or height */
     : getBoundingClientRectRelativeToVisualViewport(aTarget);
+  // moxInnerScreen{X,Y} are in CSS coordinates of the browser chrome.
+  // The device scale applies to them, but the resolution only zooms the content.
   return {
-    x: (targetWindow.mozInnerScreenX + rect.left + aX) * scale,
-    y: (targetWindow.mozInnerScreenY + rect.top + aY) * scale
+    x: (targetWindow.mozInnerScreenX + ((rect.left + aX) * resolution)) * deviceScale,
+    y: (targetWindow.mozInnerScreenY + ((rect.top + aY) * resolution)) * deviceScale
   };
 }
 
diff --git a/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html b/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
index dffdce5e129e..efdfc2539bce 100644
--- a/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
+++ b/gfx/layers/apz/test/mochitest/helper_zoomed_pan.html
@@ -34,8 +34,8 @@
       // Compute the distance from the right/bottom edge of the visual
       // viewport to the same edge of the layout viewport and add the desired
       // offset to that.
-      const layout = (visual + scrollbarWidth) * RESOLUTION;
-      return layout - visual + OFFSET_SCREEN_PX;
+      const layout = (visual + scrollbarWidth);
+      return layout - (visual / RESOLUTION) + OFFSET_CSS_PX;
     }
 
     function* test(testDriver) {
@@ -51,7 +51,7 @@
           },
         },
         {
-          x: OFFSET_SCREEN_PX,
+          x: OFFSET_CSS_PX,
           y: 0,
           dx: (width) => 0,
           dy: (height) => -computeDelta(height, horizontalScrollbarWidth),

From c6b8e50b3161f3fca22dc6423d29a0b9c9f8e80f Mon Sep 17 00:00:00 2001
From: Botond Ballo <botond@mozilla.com>
Date: Thu, 8 Nov 2018 22:24:56 +0000
Subject: [PATCH 68/77] Bug 1496864 - Target the inside of the button rather
 than the edge in helper_fixed_position_scroll_hittest.html. r=kats

Differential Revision: https://phabricator.services.mozilla.com/D11231

--HG--
extra : moz-landing-system : lando
---
 .../test/mochitest/helper_fixed_position_scroll_hittest.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html b/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html
index 4945c2bcc70a..9066e5594df0 100644
--- a/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html
+++ b/gfx/layers/apz/test/mochitest/helper_fixed_position_scroll_hittest.html
@@ -40,7 +40,7 @@
       // decreases the rate of intermittents that we see. We should figure out
       // why and/or rewrite this test entirely.
       SpecialPowers.Services.obs.addObserver(testDriver, "mouseevent");
-      yield synthesizeNativeClick(input, 0, 0, testDriver);
+      yield synthesizeNativeClick(input, 10, 10, testDriver);
       SpecialPowers.Services.obs.removeObserver(testDriver, "mouseevent", false);
     }
     window.addEventListener("click", (e) => {

From de1a5ced633a014ba88f54eece6f96c81de86bea Mon Sep 17 00:00:00 2001
From: Andreas Farre <farre@mozilla.com>
Date: Thu, 8 Nov 2018 21:58:58 +0000
Subject: [PATCH 69/77] Bug 1496722 - Make nsIDocShellTreeItem.itemType
 readonly. r=peterv

Differential Revision: https://phabricator.services.mozilla.com/D7900

--HG--
extra : moz-landing-system : lando
---
 docshell/base/nsDocShell.cpp                | 43 ++++-----------------
 docshell/base/nsDocShell.h                  |  7 ++--
 docshell/base/nsIDocShellTreeItem.idl       |  2 +-
 dom/ipc/TabChild.cpp                        |  5 +--
 toolkit/components/browser/nsWebBrowser.cpp | 20 +---------
 toolkit/components/browser/nsWebBrowser.h   |  4 +-
 xpfe/appshell/nsAppShellService.cpp         | 11 +++---
 7 files changed, 22 insertions(+), 70 deletions(-)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 015ccb81c1d2..cc22e384561d 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -311,9 +311,10 @@ DecreasePrivateDocShellCount()
   }
 }
 
-nsDocShell::nsDocShell()
+nsDocShell::nsDocShell(BrowsingContext* aBrowsingContext)
   : nsDocLoader()
   , mContentWindowID(NextWindowID())
+  , mBrowsingContext(aBrowsingContext)
   , mForcedCharset(nullptr)
   , mParentCharset(nullptr)
   , mTreeOwner(nullptr)
@@ -324,7 +325,7 @@ nsDocShell::nsDocShell()
   , mParentCharsetSource(0)
   , mMarginWidth(-1)
   , mMarginHeight(-1)
-  , mItemType(typeContent)
+  , mItemType(aBrowsingContext->IsContent() ? typeContent : typeChrome)
   , mPreviousEntryIndex(-1)
   , mLoadedEntryIndex(-1)
   , mChildOffset(0)
@@ -361,7 +362,7 @@ nsDocShell::nsDocShell()
   , mUseStrictSecurityChecks(false)
   , mObserveErrorPages(true)
   , mCSSErrorReportingEnabled(false)
-  , mAllowAuth(true)
+  , mAllowAuth(mItemType == typeContent)
   , mAllowKeywordFixup(false)
   , mIsOffScreenBrowser(false)
   , mIsActive(true)
@@ -460,8 +461,7 @@ nsDocShell::Create(BrowsingContext* aBrowsingContext)
   MOZ_ASSERT(aBrowsingContext, "DocShell without a BrowsingContext!");
 
   nsresult rv;
-  RefPtr<nsDocShell> ds = new nsDocShell();
-  ds->mBrowsingContext = aBrowsingContext;
+  RefPtr<nsDocShell> ds = new nsDocShell(aBrowsingContext);
 
   // Initialize the underlying nsDocLoader.
   rv = ds->nsDocLoader::Init();
@@ -506,9 +506,6 @@ nsDocShell::Create(BrowsingContext* aBrowsingContext)
     return nullptr;
   }
 
-  // Set our DocShellTreeItem type based on our BrowsingContext
-  ds->SetItemType(aBrowsingContext->IsContent() ? typeContent : typeChrome);
-
   // If our parent is present in this process, set up our parent now.
   RefPtr<BrowsingContext> parent = aBrowsingContext->GetParent();
   if (parent && parent->GetDocShell()) {
@@ -2597,34 +2594,8 @@ nsDocShell::GetItemType(int32_t* aItemType)
 {
   NS_ENSURE_ARG_POINTER(aItemType);
 
-  *aItemType = ItemType();
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDocShell::SetItemType(int32_t aItemType)
-{
-  NS_ENSURE_ARG((aItemType == typeChrome) || (typeContent == aItemType));
-
-  // Only allow setting the type on root docshells.  Those would be the ones
-  // that have the docloader service as mParent or have no mParent at all.
-  nsCOMPtr<nsIDocumentLoader> docLoaderService =
-    do_GetService(NS_DOCUMENTLOADER_SERVICE_CONTRACTID);
-  NS_ENSURE_TRUE(docLoaderService, NS_ERROR_UNEXPECTED);
-
-  NS_ENSURE_STATE(!mParent || mParent == docLoaderService);
-
-  mItemType = aItemType;
-
-  // disable auth prompting for anything but content
-  mAllowAuth = mItemType == typeContent;
-
-  RefPtr<nsPresContext> presContext = nullptr;
-  GetPresContext(getter_AddRefs(presContext));
-  if (presContext) {
-    presContext->UpdateIsChrome();
-  }
-
+  MOZ_DIAGNOSTIC_ASSERT((mBrowsingContext->IsContent() ? typeContent : typeChrome) == mItemType);
+  *aItemType = mItemType;
   return NS_OK;
 }
 
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
index 5e4a4efcff43..d845b0b6859e 100644
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -409,7 +409,7 @@ private: // member functions
   friend void mozilla::TimelineConsumers::PopMarkers(nsDocShell*,
     JSContext*, nsTArray<dom::ProfileTimelineMarker>&);
 
-  nsDocShell();
+  explicit nsDocShell(mozilla::dom::BrowsingContext* aBrowsingContext);
 
   // Security checks to prevent frameset spoofing. See comments at
   // implementation sites.
@@ -1043,9 +1043,8 @@ private: // data members
   int32_t mMarginWidth;
   int32_t mMarginHeight;
 
-  // This can either be a content docshell or a chrome docshell. After
-  // Create() is called, the type is not expected to change.
-  int32_t mItemType;
+  // This can either be a content docshell or a chrome docshell.
+  const int32_t mItemType;
 
   // Index into the nsISHEntry array, indicating the previous and current
   // entry at the time that this DocShell begins to load. Consequently
diff --git a/docshell/base/nsIDocShellTreeItem.idl b/docshell/base/nsIDocShellTreeItem.idl
index 3ecb97b8088f..d78c81367225 100644
--- a/docshell/base/nsIDocShellTreeItem.idl
+++ b/docshell/base/nsIDocShellTreeItem.idl
@@ -47,7 +47,7 @@ interface nsIDocShellTreeItem : nsISupports
 	/*
 	The type this item is.  
 	*/
-	attribute long itemType;
+	readonly attribute long itemType;
 	[noscript,notxpcom,nostdcall] long ItemType();
 
 	/*
diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
index 1bd92c81666b..8bad6a983220 100644
--- a/dom/ipc/TabChild.cpp
+++ b/dom/ipc/TabChild.cpp
@@ -548,7 +548,7 @@ TabChild::Init()
 
   // Directly create our web browser object and store it, so we can start
   // eliminating QIs.
-  mWebBrowser = new nsWebBrowser();
+  mWebBrowser = new nsWebBrowser(nsIDocShellTreeItem::typeContentWrapper);
   nsIWebBrowser* webBrowser = mWebBrowser;
 
   webBrowser->SetContainerWindow(this);
@@ -556,9 +556,6 @@ TabChild::Init()
   mWebNav = do_QueryInterface(webBrowser);
   NS_ASSERTION(mWebNav, "nsWebBrowser doesn't implement nsIWebNavigation?");
 
-  nsCOMPtr<nsIDocShellTreeItem> docShellItem(do_QueryInterface(WebNavigation()));
-  docShellItem->SetItemType(nsIDocShellTreeItem::typeContentWrapper);
-
   nsCOMPtr<nsIBaseWindow> baseWindow = do_QueryInterface(WebNavigation());
   if (!baseWindow) {
     NS_ERROR("mWebNav doesn't QI to nsIBaseWindow");
diff --git a/toolkit/components/browser/nsWebBrowser.cpp b/toolkit/components/browser/nsWebBrowser.cpp
index 20f644f8c4f5..a3261f91daab 100644
--- a/toolkit/components/browser/nsWebBrowser.cpp
+++ b/toolkit/components/browser/nsWebBrowser.cpp
@@ -56,9 +56,9 @@ using namespace mozilla;
 using namespace mozilla::gfx;
 using namespace mozilla::layers;
 
-nsWebBrowser::nsWebBrowser()
+nsWebBrowser::nsWebBrowser(int aItemType)
   : mInitInfo(new nsWebBrowserInitInfo())
-  , mContentType(typeContentWrapper)
+  , mContentType(aItemType)
   , mActivating(false)
   , mShouldEnableHistory(true)
   , mIsActive(true)
@@ -300,22 +300,6 @@ nsWebBrowser::GetItemType(int32_t* aItemType)
   return NS_OK;
 }
 
-NS_IMETHODIMP
-nsWebBrowser::SetItemType(int32_t aItemType)
-{
-  NS_ENSURE_TRUE(
-    aItemType == typeContentWrapper || aItemType == typeChromeWrapper,
-    NS_ERROR_FAILURE);
-  mContentType = aItemType;
-  if (mDocShell) {
-    mDocShell->SetItemType(mContentType == typeChromeWrapper ?
-                             static_cast<int32_t>(typeChrome) :
-                             static_cast<int32_t>(typeContent));
-  }
-
-  return NS_OK;
-}
-
 NS_IMETHODIMP
 nsWebBrowser::GetParent(nsIDocShellTreeItem** aParent)
 {
diff --git a/toolkit/components/browser/nsWebBrowser.h b/toolkit/components/browser/nsWebBrowser.h
index 363387b20591..276f6cab0ad7 100644
--- a/toolkit/components/browser/nsWebBrowser.h
+++ b/toolkit/components/browser/nsWebBrowser.h
@@ -87,7 +87,7 @@ public:
     nsWebBrowser* mWebBrowser;
   };
 
-  nsWebBrowser();
+  explicit nsWebBrowser(int aItemType = typeContentWrapper);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsWebBrowser, nsIWebBrowser)
@@ -134,7 +134,7 @@ protected:
   nsCOMPtr<nsIWidget> mInternalWidget;
   nsCOMPtr<nsIWindowWatcher> mWWatch;
   nsAutoPtr<nsWebBrowserInitInfo> mInitInfo;
-  uint32_t mContentType;
+  const uint32_t mContentType;
   bool mActivating;
   bool mShouldEnableHistory;
   bool mIsActive;
diff --git a/xpfe/appshell/nsAppShellService.cpp b/xpfe/appshell/nsAppShellService.cpp
index 66c4ba1323aa..b3ab7636af22 100644
--- a/xpfe/appshell/nsAppShellService.cpp
+++ b/xpfe/appshell/nsAppShellService.cpp
@@ -46,6 +46,8 @@
 #include "nsIDocShell.h"
 #include "gfxPlatform.h"
 
+#include "nsWebBrowser.h"
+
 #ifdef MOZ_INSTRUMENT_EVENT_LOOP
 #include "EventTracer.h"
 #endif
@@ -479,7 +481,10 @@ nsAppShellService::CreateWindowlessBrowser(bool aIsChrome, nsIWindowlessBrowser
   /* First, we create an instance of nsWebBrowser. Instances of this class have
    * an associated doc shell, which is what we're interested in.
    */
-  nsCOMPtr<nsIWebBrowser> browser = do_CreateInstance(NS_WEBBROWSER_CONTRACTID);
+  nsCOMPtr<nsIWebBrowser> browser =
+    new nsWebBrowser(aIsChrome ? nsIDocShellTreeItem::typeChromeWrapper
+                               : nsIDocShellTreeItem::typeContentWrapper);
+
   if (!browser) {
     NS_ERROR("Couldn't create instance of nsWebBrowser!");
     return NS_ERROR_FAILURE;
@@ -495,10 +500,6 @@ nsAppShellService::CreateWindowlessBrowser(bool aIsChrome, nsIWindowlessBrowser
 
   nsCOMPtr<nsIWebNavigation> navigation = do_QueryInterface(browser);
 
-  nsCOMPtr<nsIDocShellTreeItem> item = do_QueryInterface(navigation);
-  item->SetItemType(aIsChrome ? nsIDocShellTreeItem::typeChromeWrapper
-                              : nsIDocShellTreeItem::typeContentWrapper);
-
   /* A windowless web browser doesn't have an associated OS level window. To
    * accomplish this, we initialize the window associated with our instance of
    * nsWebBrowser with an instance of HeadlessWidget/PuppetWidget, which provide

From 3fdb63b8b7ae9a94bddf43fe3a23f442c86d5e13 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Wed, 7 Nov 2018 17:22:13 +0000
Subject: [PATCH 70/77] Bug 1499067 - Stub implementation of
 BrowserApp.closeTab for GeckoView. r=snorp

Differential Revision: https://phabricator.services.mozilla.com/D11121

--HG--
extra : moz-landing-system : lando
---
 mobile/android/modules/geckoview/GeckoViewTab.jsm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mobile/android/modules/geckoview/GeckoViewTab.jsm b/mobile/android/modules/geckoview/GeckoViewTab.jsm
index a3aec8b8de32..325dec8f6257 100644
--- a/mobile/android/modules/geckoview/GeckoViewTab.jsm
+++ b/mobile/android/modules/geckoview/GeckoViewTab.jsm
@@ -30,6 +30,10 @@ class GeckoViewTab extends GeckoViewModule {
       tabs: [tab],
       selectedTab: tab,
 
+      closeTab: function(aTab) {
+        // not implemented
+      },
+
       getTabForId: function(aId) {
         return this.selectedTab;
       },

From 5a6ffe96184203813caf0bdc63a947f1f78fc462 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 8 Nov 2018 22:35:51 +0000
Subject: [PATCH 71/77] Bug 1505328 - Remove the theme transition from the
 title bar. r=dao

This patch solves half of the problem but it will still show the transition when the window regains focus. I am OK with removing the transition on the title bar, we will still have it on the navbar and bookmarks toolbar.

Differential Revision: https://phabricator.services.mozilla.com/D11282

--HG--
extra : moz-landing-system : lando
---
 .../test/browser/browser_ext_management.js    |  8 -------
 browser/themes/shared/browser.inc.css         |  4 ----
 .../browser_ext_themes_alpha_accentcolor.js   |  9 ++------
 .../browser_ext_themes_chromeparity.js        | 15 +++----------
 .../browser_ext_themes_dynamic_updates.js     | 12 ++--------
 .../browser/browser_ext_themes_lwtsupport.js  |  4 +---
 .../browser_ext_themes_sanitization.js        | 22 ++-----------------
 .../browser_ext_themes_theme_transition.js    | 15 +------------
 8 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/browser/components/extensions/test/browser/browser_ext_management.js b/browser/components/extensions/test/browser/browser_ext_management.js
index fe63609a2652..abb573a7c794 100644
--- a/browser/components/extensions/test/browser/browser_ext_management.js
+++ b/browser/components/extensions/test/browser/browser_ext_management.js
@@ -2,12 +2,6 @@
 
 const BASE = "http://mochi.test:8888/browser/browser/components/extensions/test/browser/";
 
-function waitForTransition(element, propertyName) {
-  return BrowserTestUtils.waitForEvent(element, "transitionend", false, event => {
-    return event.target == element && event.propertyName == propertyName;
-  });
-}
-
 add_task(async function test_management_install() {
   await SpecialPowers.pushPrefEnv({set: [
     ["xpinstall.signatures.required", false],
@@ -57,14 +51,12 @@ add_task(async function test_management_install() {
   await extension.awaitMessage("ready");
 
   // Test installing a static WE theme.
-  let transitionDone = waitForTransition(document.documentElement, "background-color");
   clickBrowserAction(extension);
 
   let {id, type} = await extension.awaitMessage("installed");
   is(id, "tiger@persona.beard", "Static web extension theme installed");
   is(type, "theme", "Extension type is correct");
 
-  await transitionDone;
   let style = window.getComputedStyle(document.documentElement);
   is(style.backgroundColor, "rgb(255, 165, 0)", "Background is the new black");
 
diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css
index f4e954e644a0..12f4d01b3d82 100644
--- a/browser/themes/shared/browser.inc.css
+++ b/browser/themes/shared/browser.inc.css
@@ -19,10 +19,6 @@
   --space-above-tabbar: 8px;
 }
 
-:root[sessionrestored]:-moz-lwtheme {
-  transition: @themeTransition@;
-}
-
 /* Increase contrast of UI links on dark themes */
 
 :root[lwt-popup-brighttext] panel .text-link {
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
index 2fe5bd95a8fd..8a48e44cbf14 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_alpha_accentcolor.js
@@ -18,15 +18,10 @@ add_task(async function test_alpha_accentcolor() {
     },
   });
 
-  // Add the event listener before loading the extension
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
-
   await extension.startup();
 
-  // wait for theme transition to end
-  await transitionPromise;
-
+  // Add the event listener before loading the extension
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(230, 128, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
index 1866ccb34afe..3afef7b4bd7c 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_chromeparity.js
@@ -20,11 +20,9 @@ add_task(async function test_support_theme_frame() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
   Assert.equal(docEl.getAttribute("lwthemetextcolor"), "bright",
                "LWT text color attribute should be set");
@@ -64,21 +62,16 @@ add_task(async function test_support_theme_frame_inactive() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
                "Window background is set to the colors.frame property");
 
   // Now we'll open a new window to see if the inactive browser accent color changed
-  transitionPromise = waitForTransition(docEl, "background-color");
   let window2 = await BrowserTestUtils.openNewBrowserWindow();
-  await transitionPromise;
-
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR_INACTIVE.join(", ") + ")",
                `Inactive window background color should be ${FRAME_COLOR_INACTIVE}`);
 
@@ -108,11 +101,9 @@ add_task(async function test_lack_of_theme_frame_inactive() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.equal(style.backgroundColor, "rgb(" + FRAME_COLOR.join(", ") + ")",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
index 70b512cf4f8c..d0038f950ab1 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_dynamic_updates.js
@@ -63,8 +63,6 @@ add_task(async function test_dynamic_theme_updates() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image1.png",
@@ -76,11 +74,9 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme("image1.png", ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
-  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": "image2.png",
@@ -92,7 +88,6 @@ add_task(async function test_dynamic_theme_updates() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme("image2.png", ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -105,6 +100,7 @@ add_task(async function test_dynamic_theme_updates() {
 
   await extension.unload();
 
+  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
 
@@ -131,8 +127,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   let defaultStyle = window.getComputedStyle(window.document.documentElement);
   await extension.startup();
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_1,
@@ -144,11 +138,9 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme(BACKGROUND_1, ACCENT_COLOR_1, TEXT_COLOR_1, true);
 
-  transitionPromise = waitForTransition(docEl, "background-color");
   extension.sendMessage("update-theme", {
     "images": {
       "headerURL": BACKGROUND_2,
@@ -160,7 +152,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
   });
 
   await extension.awaitMessage("theme-updated");
-  await transitionPromise;
 
   validateTheme(BACKGROUND_2, ACCENT_COLOR_2, TEXT_COLOR_2, true);
 
@@ -173,5 +164,6 @@ add_task(async function test_dynamic_theme_updates_with_data_url() {
 
   await extension.unload();
 
+  let docEl = window.document.documentElement;
   Assert.ok(!docEl.hasAttribute("lwtheme"), "LWT attribute should not be set");
 });
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
index 60d579ddd020..5776cf3b30e9 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_lwtsupport.js
@@ -18,11 +18,9 @@ add_task(async function test_support_LWT_properties() {
     },
   });
 
-  let docEl = window.document.documentElement;
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = window.document.documentElement;
   let style = window.getComputedStyle(docEl);
 
   Assert.ok(docEl.hasAttribute("lwtheme"), "LWT attribute should be set");
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
index b59eddc8fd63..b664c06ba65e 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_sanitization.js
@@ -16,11 +16,7 @@ add_task(async function test_sanitization_invalid() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -46,11 +42,7 @@ add_task(async function test_sanitization_css_variables() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.equal(
@@ -76,11 +68,7 @@ add_task(async function test_sanitization_transparent() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
   let navbar = document.querySelector("#nav-bar");
   Assert.ok(
@@ -104,12 +92,9 @@ add_task(async function test_sanitization_transparent_accentcolor() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = document.documentElement;
   Assert.equal(
     window.getComputedStyle(docEl).backgroundColor,
     "rgb(255, 255, 255)",
@@ -132,12 +117,9 @@ add_task(async function test_sanitization_transparent_textcolor() {
     },
   });
 
-  let docEl = document.documentElement;
-
-  let transitionPromise = waitForTransition(docEl, "background-color");
   await extension.startup();
-  await transitionPromise;
 
+  let docEl = document.documentElement;
   Assert.equal(
     window.getComputedStyle(docEl).color,
     "rgb(0, 0, 0)",
diff --git a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
index 804fa1e65006..92f1df6ab4ab 100644
--- a/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
+++ b/toolkit/components/extensions/test/browser/browser_ext_themes_theme_transition.js
@@ -4,7 +4,6 @@
 // correctly.
 
 add_task(async function test_theme_transition_effects() {
-  const ACCENT_COLOR = "#aaf442";
   const TOOLBAR = "#f27489";
   const TEXT_COLOR = "#000000";
   const TRANSITION_PROPERTY = "background-color";
@@ -13,7 +12,6 @@ add_task(async function test_theme_transition_effects() {
     manifest: {
       "theme": {
         "colors": {
-          "accentcolor": ACCENT_COLOR,
           "textcolor": TEXT_COLOR,
           "toolbar": TOOLBAR,
           "toolbar_text": TEXT_COLOR,
@@ -24,18 +22,7 @@ add_task(async function test_theme_transition_effects() {
 
   await extension.startup();
 
-  // check if transition effect is set for root, which affects transition for
-  // accent color
-  let docEl = window.document.documentElement;
-  let rootCS = window.getComputedStyle(docEl);
-
-  Assert.equal(
-    rootCS.getPropertyValue("transition-property"),
-    TRANSITION_PROPERTY,
-    "Transition property set for root"
-  );
-
-  // now check transition effect for toolbars
+  // check transition effect for toolbars
   let navbar = document.querySelector("#nav-bar");
   let navbarCS = window.getComputedStyle(navbar);
 

From 56f2b4fded57f6de90ba1bbc903f4b2d734d0868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 22:39:34 +0000
Subject: [PATCH 72/77] Bug 1505786 - Implement overflow-wrap: anywhere.
 r=xidorn,jfkthame

Per https://github.com/w3c/csswg-drafts/issues/2682

Differential Revision: https://phabricator.services.mozilla.com/D11328

--HG--
extra : moz-landing-system : lando
---
 .../shared/css/generated/properties-db.js     |  2 ++
 layout/generic/nsTextFrame.cpp                |  3 +--
 layout/style/ServoBindings.toml               |  1 +
 layout/style/ServoCSSPropList.mako.py         |  1 +
 layout/style/nsStyleConsts.h                  |  4 ----
 layout/style/nsStyleStruct.cpp                |  2 +-
 layout/style/nsStyleStruct.h                  |  9 ++++---
 modules/libpref/init/StaticPrefList.h         |  7 ------
 servo/components/style/cbindgen.toml          |  1 +
 servo/components/style/properties/data.py     |  1 +
 .../components/style/properties/gecko.mako.rs |  1 +
 .../longhands/inherited_text.mako.rs          | 11 +++++----
 servo/components/style/values/computed/mod.rs |  2 +-
 .../components/style/values/computed/text.rs  |  1 +
 .../components/style/values/specified/mod.rs  |  2 +-
 .../components/style/values/specified/text.rs | 24 +++++++++++++++++++
 ...verflow-wrap-min-content-size-001.html.ini |  2 --
 ...verflow-wrap-min-content-size-002.html.ini |  2 --
 ...verflow-wrap-min-content-size-003.html.ini |  2 --
 .../overflow-wrap-min-content-size-001.html   |  6 ++---
 .../overflow-wrap-min-content-size-002.html   |  6 ++---
 .../overflow-wrap-min-content-size-003.html   |  6 ++---
 22 files changed, 57 insertions(+), 39 deletions(-)
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html.ini
 delete mode 100644 testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html.ini

diff --git a/devtools/shared/css/generated/properties-db.js b/devtools/shared/css/generated/properties-db.js
index eb7d43b03c89..04d5745bc028 100644
--- a/devtools/shared/css/generated/properties-db.js
+++ b/devtools/shared/css/generated/properties-db.js
@@ -7578,6 +7578,7 @@ exports.CSS_PROPERTIES = {
     ],
     "supports": [],
     "values": [
+      "anywhere",
       "break-word",
       "inherit",
       "initial",
@@ -9204,6 +9205,7 @@ exports.CSS_PROPERTIES = {
     ],
     "supports": [],
     "values": [
+      "anywhere",
       "break-word",
       "inherit",
       "initial",
diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp
index 966efb56c6c0..66d7d9190b38 100644
--- a/layout/generic/nsTextFrame.cpp
+++ b/layout/generic/nsTextFrame.cpp
@@ -8607,8 +8607,7 @@ nsTextFrame::AddInlineMinISizeForFlow(gfxContext *aRenderingContext,
     return;
   }
 
-  // If overflow-wrap is break-word, we can wrap everywhere.
-  if (StaticPrefs::layout_css_overflow_break_intrinsic_size() &&
+  if (textStyle->mOverflowWrap == mozilla::StyleOverflowWrap::Anywhere &&
       textStyle->WordCanWrap(this)) {
     aData->OptionallyBreak();
     aData->mCurrentLine +=
diff --git a/layout/style/ServoBindings.toml b/layout/style/ServoBindings.toml
index 88a804470e8e..4ed046ddeacb 100644
--- a/layout/style/ServoBindings.toml
+++ b/layout/style/ServoBindings.toml
@@ -395,6 +395,7 @@ cbindgen-types = [
     { gecko = "StyleFontLanguageOverride", servo = "values::computed::font::FontLanguageOverride" },
     { gecko = "StylePathCommand", servo = "values::specified::svg_path::PathCommand" },
     { gecko = "StyleUnicodeRange", servo = "cssparser::UnicodeRange" },
+    { gecko = "StyleOverflowWrap", servo = "values::computed::OverflowWrap" },
 ]
 
 mapped-generic-types = [
diff --git a/layout/style/ServoCSSPropList.mako.py b/layout/style/ServoCSSPropList.mako.py
index 22c67b631e10..48d52eef36e8 100644
--- a/layout/style/ServoCSSPropList.mako.py
+++ b/layout/style/ServoCSSPropList.mako.py
@@ -102,6 +102,7 @@ SERIALIZED_PREDEFINED_TYPES = [
     "ListStyleType",
     "OffsetPath",
     "Opacity",
+    "OverflowWrap",
     "Quotes",
     "Resize",
     "Scale",
diff --git a/layout/style/nsStyleConsts.h b/layout/style/nsStyleConsts.h
index adf4fdabfd51..58c7688dadbe 100644
--- a/layout/style/nsStyleConsts.h
+++ b/layout/style/nsStyleConsts.h
@@ -788,10 +788,6 @@ enum class StyleWhiteSpace : uint8_t {
 #define NS_STYLE_WORDBREAK_BREAK_ALL            1
 #define NS_STYLE_WORDBREAK_KEEP_ALL             2
 
-// See nsStyleText
-#define NS_STYLE_OVERFLOWWRAP_NORMAL            0
-#define NS_STYLE_OVERFLOWWRAP_BREAK_WORD        1
-
 // ruby-align, see nsStyleText
 #define NS_STYLE_RUBY_ALIGN_START               0
 #define NS_STYLE_RUBY_ALIGN_CENTER              1
diff --git a/layout/style/nsStyleStruct.cpp b/layout/style/nsStyleStruct.cpp
index 17e3d87b2b57..0398f6894ae0 100644
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -4249,7 +4249,7 @@ nsStyleText::nsStyleText(const nsPresContext* aContext)
   , mTextTransform(NS_STYLE_TEXT_TRANSFORM_NONE)
   , mWhiteSpace(StyleWhiteSpace::Normal)
   , mWordBreak(NS_STYLE_WORDBREAK_NORMAL)
-  , mOverflowWrap(NS_STYLE_OVERFLOWWRAP_NORMAL)
+  , mOverflowWrap(StyleOverflowWrap::Normal)
   , mHyphens(StyleHyphens::Manual)
   , mRubyAlign(NS_STYLE_RUBY_ALIGN_SPACE_AROUND)
   , mRubyPosition(NS_STYLE_RUBY_POSITION_OVER)
diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h
index 9930ba6312c1..b1423b325121 100644
--- a/layout/style/nsStyleStruct.h
+++ b/layout/style/nsStyleStruct.h
@@ -1578,7 +1578,7 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText
   uint8_t mTextTransform;               // NS_STYLE_TEXT_TRANSFORM_*
   mozilla::StyleWhiteSpace mWhiteSpace;
   uint8_t mWordBreak;                   // NS_STYLE_WORDBREAK_*
-  uint8_t mOverflowWrap;                // NS_STYLE_OVERFLOWWRAP_*
+  mozilla::StyleOverflowWrap mOverflowWrap;
   mozilla::StyleHyphens mHyphens;
   uint8_t mRubyAlign;                   // NS_STYLE_RUBY_ALIGN_*
   uint8_t mRubyPosition;                // NS_STYLE_RUBY_POSITION_*
@@ -1634,8 +1634,11 @@ struct MOZ_NEEDS_MEMMOVABLE_MEMBERS nsStyleText
   }
 
   bool WordCanWrapStyle() const {
-    return WhiteSpaceCanWrapStyle() &&
-           mOverflowWrap == NS_STYLE_OVERFLOWWRAP_BREAK_WORD;
+    if (!WhiteSpaceCanWrapStyle()) {
+      return false;
+    }
+    return mOverflowWrap == mozilla::StyleOverflowWrap::BreakWord ||
+           mOverflowWrap == mozilla::StyleOverflowWrap::Anywhere;
   }
 
   bool HasTextEmphasis() const {
diff --git a/modules/libpref/init/StaticPrefList.h b/modules/libpref/init/StaticPrefList.h
index 9bfd9028add2..bd41c88dbe00 100644
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -804,13 +804,6 @@ VARCACHE_PREF(
   bool, false
 )
 
-// Does overflow-break: break-word affect intrinsic size?
-VARCACHE_PREF(
-  "layout.css.overflow-break.intrinsic-size",
-   layout_css_overflow_break_intrinsic_size,
-  bool, false
-)
-
 // Does arbitrary ::-webkit-* pseudo-element parsed?
 VARCACHE_PREF(
   "layout.css.unknown-webkit-pseudo-element",
diff --git a/servo/components/style/cbindgen.toml b/servo/components/style/cbindgen.toml
index 50252690054a..06c1730622a2 100644
--- a/servo/components/style/cbindgen.toml
+++ b/servo/components/style/cbindgen.toml
@@ -49,6 +49,7 @@ include = [
   "FontDisplay",
   "FontFaceSourceListComponent",
   "FontLanguageOverride",
+  "OverflowWrap",
   "TimingFunction",
   "PathCommand",
   "UnicodeRange",
diff --git a/servo/components/style/properties/data.py b/servo/components/style/properties/data.py
index 5b07f9c326a5..a7372c481818 100644
--- a/servo/components/style/properties/data.py
+++ b/servo/components/style/properties/data.py
@@ -324,6 +324,7 @@ class Longhand(object):
                 "Opacity",
                 "OutlineStyle",
                 "OverflowClipBox",
+                "OverflowWrap",
                 "OverscrollBehavior",
                 "Percentage",
                 "Resize",
diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs
index 7fe1cd4d5c78..b7c9179f2922 100644
--- a/servo/components/style/properties/gecko.mako.rs
+++ b/servo/components/style/properties/gecko.mako.rs
@@ -1419,6 +1419,7 @@ impl Clone for ${style_struct.gecko_struct_name} {
         "NonNegativeNumber": impl_simple,
         "Number": impl_simple,
         "Opacity": impl_simple,
+        "OverflowWrap": impl_simple,
         "Perspective": impl_style_coord,
         "Position": impl_position,
         "RGBAColor": impl_rgba_color,
diff --git a/servo/components/style/properties/longhands/inherited_text.mako.rs b/servo/components/style/properties/longhands/inherited_text.mako.rs
index 164f8a7dea14..431e73e99a20 100644
--- a/servo/components/style/properties/longhands/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhands/inherited_text.mako.rs
@@ -61,15 +61,16 @@ ${helpers.predefined_type(
     servo_restyle_damage = "reflow",
 )}
 
-// Also known as "word-wrap" (which is more popular because of IE), but this is the preferred
-// name per CSS-TEXT 6.2.
-${helpers.single_keyword(
+// Also known as "word-wrap" (which is more popular because of IE), but this is
+// the preferred name per CSS-TEXT 6.2.
+${helpers.predefined_type(
     "overflow-wrap",
-    "normal break-word",
-    gecko_constant_prefix="NS_STYLE_OVERFLOWWRAP",
+    "OverflowWrap",
+    "computed::OverflowWrap::Normal",
     animation_value_type="discrete",
     spec="https://drafts.csswg.org/css-text/#propdef-overflow-wrap",
     alias="word-wrap",
+    needs_context=False,
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
diff --git a/servo/components/style/values/computed/mod.rs b/servo/components/style/values/computed/mod.rs
index 0cf1dac56866..40a350dedc07 100644
--- a/servo/components/style/values/computed/mod.rs
+++ b/servo/components/style/values/computed/mod.rs
@@ -78,7 +78,7 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
 pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle};
-pub use self::text::{TextOverflow, WordSpacing};
+pub use self::text::{TextOverflow, WordSpacing, OverflowWrap};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, Transform, TransformOperation};
 pub use self::transform::{TransformOrigin, TransformStyle, Translate};
diff --git a/servo/components/style/values/computed/text.rs b/servo/components/style/values/computed/text.rs
index f8443ec607ac..daddfedc910f 100644
--- a/servo/components/style/values/computed/text.rs
+++ b/servo/components/style/values/computed/text.rs
@@ -19,6 +19,7 @@ use values::{CSSFloat, CSSInteger};
 
 pub use values::specified::TextAlignKeyword as TextAlign;
 pub use values::specified::TextEmphasisPosition;
+pub use values::specified::OverflowWrap;
 
 /// A computed value for the `initial-letter` property.
 pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>;
diff --git a/servo/components/style/values/specified/mod.rs b/servo/components/style/values/specified/mod.rs
index 21fd4b86e944..0cbd957147ca 100644
--- a/servo/components/style/values/specified/mod.rs
+++ b/servo/components/style/values/specified/mod.rs
@@ -76,7 +76,7 @@ pub use self::svg_path::SVGPathData;
 pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
 pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
-pub use self::text::{TextEmphasisPosition, TextEmphasisStyle};
+pub use self::text::{TextEmphasisPosition, TextEmphasisStyle, OverflowWrap};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, Transform};
 pub use self::transform::{TransformOrigin, TransformStyle, Translate};
diff --git a/servo/components/style/values/specified/text.rs b/servo/components/style/values/specified/text.rs
index 32405076054e..a62825147c9b 100644
--- a/servo/components/style/values/specified/text.rs
+++ b/servo/components/style/values/specified/text.rs
@@ -659,6 +659,8 @@ impl ToComputedValue for TextEmphasisStyle {
     fn to_computed_value(&self, context: &Context) -> Self::ComputedValue {
         match *self {
             TextEmphasisStyle::Keyword(ref keyword) => {
+                // FIXME(emilio): This should set the rule_cache_conditions
+                // properly.
                 let default_shape = if context.style().get_inherited_box().clone_writing_mode() ==
                     SpecifiedWritingMode::HorizontalTb
                 {
@@ -680,6 +682,7 @@ impl ToComputedValue for TextEmphasisStyle {
             },
         }
     }
+
     #[inline]
     fn from_computed_value(computed: &Self::ComputedValue) -> Self {
         match *computed {
@@ -877,3 +880,24 @@ impl Parse for MozTabSize {
         )?))
     }
 }
+
+/// Values for the `overflow-wrap` property.
+#[repr(u8)]
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+)]
+#[allow(missing_docs)]
+pub enum OverflowWrap {
+    Normal,
+    BreakWord,
+    Anywhere,
+}
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html.ini
deleted file mode 100644
index b8d2b741cda3..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[overflow-wrap-min-content-size-001.html]
-  prefs: [layout.css.overflow-break.intrinsic-size:true]
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html.ini
deleted file mode 100644
index a7f74abcf099..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[overflow-wrap-min-content-size-002.html]
-  prefs: [layout.css.overflow-break.intrinsic-size:true]
diff --git a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html.ini b/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html.ini
deleted file mode 100644
index d831f9ab237e..000000000000
--- a/testing/web-platform/meta/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[overflow-wrap-min-content-size-003.html]
-  prefs: [layout.css.overflow-break.intrinsic-size:true]
diff --git a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html
index e4a7ef4a3852..608d4853a242 100644
--- a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html
+++ b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-001.html
@@ -1,14 +1,14 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
+<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
 <link rel="author" title="Florian Rivoal" href="http://florian.rivoal.net/">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
 <meta name="flags" content="">
 <link rel="match" href="reference/overflow-wrap-min-content-size-001-ref.html">
-<meta name="assert" content="Soft wrap opportunities introduced by overflow-wrap:break-word **are** considered when calculating min-content intrinsic sizes.">
+<meta name="assert" content="Soft wrap opportunities introduced by overflow-wrap:anywhere **are** considered when calculating min-content intrinsic sizes.">
 <style>
 table {
-  overflow-wrap: break-word;
+  overflow-wrap: anywhere;
   max-width: 0;
   border: 0;
   border-collapse: collapse;
diff --git a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html
index 5b3b1f19d7ae..52f34023b820 100644
--- a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html
+++ b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-002.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
+<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
 <link rel="author" title="Xidorn Quan" href="https://www.upsuper.org/">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
 <meta name="flags" content="">
 <link rel="match" href="reference/overflow-wrap-min-content-size-002-ref.html">
-<meta name="assert" content="overflow-wrap:break-word doesn't break grapheme cluster and min-content intrinsic size should take that into account.">
+<meta name="assert" content="overflow-wrap:anywhere doesn't break grapheme cluster and min-content intrinsic size should take that into account.">
 <style>
 #wrapper {
   width: 0px;
-  overflow-wrap: break-word;
+  overflow-wrap: anywhere;
 }
 #test {
   float: left;
diff --git a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html
index d1af28ffad41..43dc1767856f 100644
--- a/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html
+++ b/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-min-content-size-003.html
@@ -1,17 +1,17 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Text Test: overflow-wrap: break-word and intrinsic sizing</title>
+<title>CSS Text Test: overflow-wrap: anywhere and intrinsic sizing</title>
 <link rel="author" title="Xidorn Quan" href="https://www.upsuper.org/">
 <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#overflow-wrap-property">
 <meta name="flags" content="ahem">
 <link rel="match" href="reference/overflow-wrap-min-content-size-003-ref.html">
-<meta name="assert" content="overflow-wrap:break-word breaks at edge of inline elements.">
+<meta name="assert" content="overflow-wrap:anywhere breaks at edge of inline elements.">
 <style>
 #wrapper {
   width: 0px;
   font: 16px / 1 Ahem;
-  overflow-wrap: break-word;
+  overflow-wrap: anywhere;
   color: green;
 }
 #test {

From b96f400afd11c01a3a8bd2038e92a85f327ef68f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 22:57:18 +0000
Subject: [PATCH 73/77] Bug 1505816 - Cleanup text-align. r=heycam

Use derive(FromPrimitive) instead.

Differential Revision: https://phabricator.services.mozilla.com/D11332

--HG--
extra : moz-landing-system : lando
---
 .../longhands/inherited_text.mako.rs          |   2 +-
 .../components/style/values/specified/text.rs | 103 +++++++-----------
 2 files changed, 39 insertions(+), 66 deletions(-)

diff --git a/servo/components/style/properties/longhands/inherited_text.mako.rs b/servo/components/style/properties/longhands/inherited_text.mako.rs
index 431e73e99a20..1e6eb98ae956 100644
--- a/servo/components/style/properties/longhands/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhands/inherited_text.mako.rs
@@ -137,7 +137,7 @@ ${helpers.single_keyword(
 ${helpers.predefined_type(
     "text-align",
     "TextAlign",
-    "computed::TextAlign::start()",
+    "computed::TextAlign::Start",
     animation_value_type="discrete",
     flags="APPLIES_TO_PLACEHOLDER",
     spec="https://drafts.csswg.org/css-text/#propdef-text-align",
diff --git a/servo/components/style/values/specified/text.rs b/servo/components/style/values/specified/text.rs
index a62825147c9b..caad6afdb70b 100644
--- a/servo/components/style/values/specified/text.rs
+++ b/servo/components/style/values/specified/text.rs
@@ -378,71 +378,44 @@ impl TextDecorationLine {
     }
 }
 
-macro_rules! define_text_align_keyword {
-    ($(
-        $(#[$($meta:tt)+])*
-        $name: ident => $discriminant: expr,
-    )+) => {
-        /// Specified value of text-align keyword value.
-        #[derive(Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq,
-                 SpecifiedValueInfo, ToComputedValue, ToCss)]
-        #[allow(missing_docs)]
-        pub enum TextAlignKeyword {
-            $(
-                $(#[$($meta)+])*
-                $name = $discriminant,
-            )+
-        }
-
-        impl TextAlignKeyword {
-            /// Construct a TextAlignKeyword from u32.
-            pub fn from_u32(discriminant: u32) -> Option<TextAlignKeyword> {
-                match discriminant {
-                    $(
-                        $discriminant => Some(TextAlignKeyword::$name),
-                    )+
-                    _ => None
-                }
-            }
-        }
-    }
-}
-
-// FIXME(emilio): Why reinventing the world?
-#[cfg(feature = "gecko")]
-define_text_align_keyword! {
-    Start => 0,
-    End => 1,
-    Left => 2,
-    Right => 3,
-    Center => 4,
-    Justify => 5,
-    MozCenter => 6,
-    MozLeft => 7,
-    MozRight => 8,
+/// Specified value of text-align keyword value.
+#[derive(
+    Clone,
+    Copy,
+    Debug,
+    Eq,
+    FromPrimitive,
+    Hash,
+    MallocSizeOf,
+    Parse,
+    PartialEq,
+    SpecifiedValueInfo,
+    ToComputedValue,
+    ToCss,
+)]
+#[allow(missing_docs)]
+pub enum TextAlignKeyword {
+    Start,
+    End,
+    Left,
+    Right,
+    Center,
+    Justify,
+    #[cfg(feature = "gecko")]
+    MozCenter,
+    #[cfg(feature = "gecko")]
+    MozLeft,
+    #[cfg(feature = "gecko")]
+    MozRight,
+    #[cfg(feature = "servo")]
+    ServoCenter,
+    #[cfg(feature = "servo")]
+    ServoLeft,
+    #[cfg(feature = "servo")]
+    ServoRight,
     #[css(skip)]
-    Char => 10,
-}
-
-#[cfg(feature = "servo")]
-define_text_align_keyword! {
-    Start => 0,
-    End => 1,
-    Left => 2,
-    Right => 3,
-    Center => 4,
-    Justify => 5,
-    ServoCenter => 6,
-    ServoLeft => 7,
-    ServoRight => 8,
-}
-
-impl TextAlignKeyword {
-    /// Return the initial value of TextAlignKeyword.
-    #[inline]
-    pub fn start() -> TextAlignKeyword {
-        TextAlignKeyword::Start
-    }
+    #[cfg(feature = "gecko")]
+    Char,
 }
 
 /// Specified value of text-align property.
@@ -508,7 +481,7 @@ impl ToComputedValue for TextAlign {
                 // but we want to set it to right -- instead set it to the default (`start`),
                 // which will do the right thing in this case (but not the general case)
                 if _context.is_root_element {
-                    return TextAlignKeyword::start();
+                    return TextAlignKeyword::Start;
                 }
                 let parent = _context
                     .builder

From ebf6bc2f9cb4eae4a30072d7b1e27d2cbbeb0124 Mon Sep 17 00:00:00 2001
From: Michael Froman <mfroman@mozilla.com>
Date: Thu, 8 Nov 2018 03:46:19 +0000
Subject: [PATCH 74/77] Bug 1471535 - pt3 - Breakout MediaDataIPDL and
 MediaRawDataIPDL structs for reuse in RDD remote decoders. r=jya

Depends on D8483

Differential Revision: https://phabricator.services.mozilla.com/D8484

--HG--
extra : moz-landing-system : lando
---
 dom/media/ipc/PMediaDecoderParams.ipdlh | 23 +++++++++++++++++++++++
 dom/media/ipc/PVideoDecoder.ipdl        | 17 +----------------
 dom/media/ipc/moz.build                 |  1 +
 3 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 dom/media/ipc/PMediaDecoderParams.ipdlh

diff --git a/dom/media/ipc/PMediaDecoderParams.ipdlh b/dom/media/ipc/PMediaDecoderParams.ipdlh
new file mode 100644
index 000000000000..40f30b84b334
--- /dev/null
+++ b/dom/media/ipc/PMediaDecoderParams.ipdlh
@@ -0,0 +1,23 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+namespace mozilla {
+
+struct MediaDataIPDL
+{
+  int64_t offset;
+  int64_t time;
+  int64_t timecode;
+  int64_t duration;
+  uint32_t frames;
+  bool keyframe;
+};
+
+struct MediaRawDataIPDL
+{
+  MediaDataIPDL base;
+  Shmem buffer;
+};
+
+} // namespace mozilla
diff --git a/dom/media/ipc/PVideoDecoder.ipdl b/dom/media/ipc/PVideoDecoder.ipdl
index bdd4ff571cba..e75e51ccee07 100644
--- a/dom/media/ipc/PVideoDecoder.ipdl
+++ b/dom/media/ipc/PVideoDecoder.ipdl
@@ -6,22 +6,13 @@
 include "mozilla/dom/MediaIPCUtils.h";
 
 include protocol PVideoDecoderManager;
+include PMediaDecoderParams;
 include LayersSurfaces;
 using mozilla::layers::LayersBackend from "mozilla/layers/LayersTypes.h";
 
 namespace mozilla {
 namespace dom {
 
-struct MediaDataIPDL
-{
-  int64_t offset;
-  int64_t time;
-  int64_t timecode;
-  int64_t duration;
-  uint32_t frames;
-  bool keyframe;
-};
-
 struct VideoDataIPDL
 {
   MediaDataIPDL base;
@@ -31,12 +22,6 @@ struct VideoDataIPDL
   int32_t frameID;
 };
 
-struct MediaRawDataIPDL
-{
-  MediaDataIPDL base;
-  Shmem buffer;
-};
-
 // This protocol provides a way to use MediaDataDecoder across processes.
 // The parent side currently is only implemented to work with
 // Window Media Foundation, but can be extended easily to support other backends.
diff --git a/dom/media/ipc/moz.build b/dom/media/ipc/moz.build
index 647aa6b25560..e0033c951877 100644
--- a/dom/media/ipc/moz.build
+++ b/dom/media/ipc/moz.build
@@ -6,6 +6,7 @@
 
 
 IPDL_SOURCES += [
+    'PMediaDecoderParams.ipdlh',
     'PVideoDecoder.ipdl',
     'PVideoDecoderManager.ipdl',
 ]

From 5e44fe20f746c5c603a8aab403611d96b4961468 Mon Sep 17 00:00:00 2001
From: Miko Mynttinen <mikokm@gmail.com>
Date: Thu, 8 Nov 2018 23:28:49 +0000
Subject: [PATCH 75/77] Bug 1504592 - Mark the right frame modified when caret
 changes r=tnikkel

Differential Revision: https://phabricator.services.mozilla.com/D11316

--HG--
extra : moz-landing-system : lando
---
 layout/base/nsCaret.cpp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp
index e84f163ba5ff..17213d766113 100644
--- a/layout/base/nsCaret.cpp
+++ b/layout/base/nsCaret.cpp
@@ -433,24 +433,14 @@ nsCaret::SchedulePaint(Selection* aSelection)
   } else {
     selection = GetSelection();
   }
-  nsINode* focusNode;
-  if (mOverrideContent) {
-    focusNode = mOverrideContent;
-  } else if (selection) {
-    focusNode = selection->GetFocusNode();
-  } else {
-    return;
+
+  int32_t frameOffset;
+  nsIFrame* frame = GetFrameAndOffset(
+    selection, mOverrideContent, mOverrideOffset, &frameOffset);
+
+  if (frame) {
+    frame->SchedulePaint();
   }
-  if (!focusNode || !focusNode->IsContent()) {
-    return;
-  }
-  nsIFrame* f = focusNode->AsContent()->GetPrimaryFrame();
-  if (!f) {
-    return;
-  }
-  // This may not be the correct continuation frame, but that's OK since we're
-  // just scheduling a paint of the window (or popup).
-  f->SchedulePaint();
 }
 
 void nsCaret::SetVisibilityDuringSelection(bool aVisibility)

From 4a4b56f77f4990413e270b94f41d3fade0739da6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Thu, 8 Nov 2018 23:07:40 +0000
Subject: [PATCH 76/77] Bug 1505565 - Split up push_applicable_declarations.
 r=heycam

Introduce RuleCollector, which contains all the state we need during the
cascade, and allows to reuse a bit of code.

Differential Revision: https://phabricator.services.mozilla.com/D11233

--HG--
extra : moz-landing-system : lando
---
 servo/components/style/lib.rs            |   1 +
 servo/components/style/rule_collector.rs | 391 +++++++++++++++++++++++
 servo/components/style/stylist.rs        | 327 ++-----------------
 3 files changed, 426 insertions(+), 293 deletions(-)
 create mode 100644 servo/components/style/rule_collector.rs

diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs
index 29df16f6183a..45d7e2906f0a 100644
--- a/servo/components/style/lib.rs
+++ b/servo/components/style/lib.rs
@@ -143,6 +143,7 @@ pub mod media_queries;
 pub mod parallel;
 pub mod parser;
 pub mod rule_cache;
+pub mod rule_collector;
 pub mod rule_tree;
 pub mod scoped_tls;
 pub mod selector_map;
diff --git a/servo/components/style/rule_collector.rs b/servo/components/style/rule_collector.rs
new file mode 100644
index 000000000000..b975beca6529
--- /dev/null
+++ b/servo/components/style/rule_collector.rs
@@ -0,0 +1,391 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+//! Collects a series of applicable rules for a given element.
+
+use applicable_declarations::{ApplicableDeclarationBlock, ApplicableDeclarationList};
+use dom::{TElement, TShadowRoot};
+use properties::{AnimationRules, PropertyDeclarationBlock};
+use rule_tree::{CascadeLevel, ShadowCascadeOrder};
+use selector_map::SelectorMap;
+use selector_parser::PseudoElement;
+use selectors::matching::{ElementSelectorFlags, MatchingContext};
+use servo_arc::ArcBorrow;
+use shared_lock::Locked;
+use smallvec::SmallVec;
+use stylesheets::Origin;
+use stylist::{AuthorStylesEnabled, Rule, RuleInclusion, Stylist};
+
+/// An object that we use with all the intermediate state needed for the
+/// cascade.
+///
+/// This is done basically to be able to organize the cascade in smaller
+/// functions, and be able to reason about it easily.
+pub struct RuleCollector<'a, 'b: 'a, E, F: 'a>
+where
+    E: TElement,
+{
+    element: E,
+    rule_hash_target: E,
+    stylist: &'a Stylist,
+    pseudo_element: Option<&'a PseudoElement>,
+    style_attribute: Option<ArcBorrow<'a, Locked<PropertyDeclarationBlock>>>,
+    smil_override: Option<ArcBorrow<'a, Locked<PropertyDeclarationBlock>>>,
+    animation_rules: AnimationRules,
+    rule_inclusion: RuleInclusion,
+    rules: &'a mut ApplicableDeclarationList,
+    context: &'a mut MatchingContext<'b, E::Impl>,
+    flags_setter: &'a mut F,
+    shadow_cascade_order: ShadowCascadeOrder,
+    matches_user_and_author_rules: bool,
+    matches_document_author_rules: bool,
+}
+
+impl<'a, 'b: 'a, E, F: 'a> RuleCollector<'a, 'b, E, F>
+where
+    E: TElement,
+    F: FnMut(&E, ElementSelectorFlags),
+{
+    /// Trivially construct a new collector.
+    pub fn new(
+        stylist: &'a Stylist,
+        element: E,
+        pseudo_element: Option<&'a PseudoElement>,
+        style_attribute: Option<ArcBorrow<'a, Locked<PropertyDeclarationBlock>>>,
+        smil_override: Option<ArcBorrow<'a, Locked<PropertyDeclarationBlock>>>,
+        animation_rules: AnimationRules,
+        rule_inclusion: RuleInclusion,
+        rules: &'a mut ApplicableDeclarationList,
+        context: &'a mut MatchingContext<'b, E::Impl>,
+        flags_setter: &'a mut F,
+    ) -> Self {
+        let rule_hash_target = element.rule_hash_target();
+        let matches_user_and_author_rules = rule_hash_target.matches_user_and_author_rules();
+
+        // Gecko definitely has pseudo-elements with style attributes, like
+        // ::-moz-color-swatch.
+        debug_assert!(
+            cfg!(feature = "gecko") || style_attribute.is_none() || pseudo_element.is_none(),
+            "Style attributes do not apply to pseudo-elements"
+        );
+        debug_assert!(pseudo_element.map_or(true, |p| !p.is_precomputed()));
+
+        Self {
+            element,
+            rule_hash_target,
+            stylist,
+            pseudo_element,
+            style_attribute,
+            smil_override,
+            animation_rules,
+            rule_inclusion,
+            context,
+            flags_setter,
+            rules,
+            matches_user_and_author_rules,
+            shadow_cascade_order: 0,
+            matches_document_author_rules: matches_user_and_author_rules,
+        }
+    }
+
+    fn collect_stylist_rules(&mut self, origin: Origin) {
+        let cascade_level = match origin {
+            Origin::UserAgent => CascadeLevel::UANormal,
+            Origin::User => CascadeLevel::UserNormal,
+            Origin::Author => CascadeLevel::SameTreeAuthorNormal,
+        };
+
+        let cascade_data = self.stylist.cascade_data().borrow_for_origin(origin);
+        let map = match cascade_data.normal_rules(self.pseudo_element) {
+            Some(m) => m,
+            None => return,
+        };
+
+        map.get_all_matching_rules(
+            self.element,
+            self.rule_hash_target,
+            self.rules,
+            self.context,
+            self.flags_setter,
+            cascade_level,
+            0,
+        );
+    }
+
+    fn collect_user_agent_rules(&mut self) {
+        self.collect_stylist_rules(Origin::UserAgent);
+    }
+
+    fn collect_user_rules(&mut self) {
+        if !self.matches_user_and_author_rules {
+            return;
+        }
+
+        self.collect_stylist_rules(Origin::User);
+    }
+
+    /// Presentational hints.
+    ///
+    /// These go before author rules, but after user rules, see:
+    /// https://drafts.csswg.org/css-cascade/#preshint
+    fn collect_presentational_hints(&mut self) {
+        if self.pseudo_element.is_some() {
+            return;
+        }
+
+        let length_before_preshints = self.rules.len();
+        self.element
+            .synthesize_presentational_hints_for_legacy_attributes(
+                self.context.visited_handling(),
+                self.rules,
+            );
+        if cfg!(debug_assertions) {
+            if self.rules.len() != length_before_preshints {
+                for declaration in &self.rules[length_before_preshints..] {
+                    assert_eq!(declaration.level(), CascadeLevel::PresHints);
+                }
+            }
+        }
+    }
+
+    fn collect_rules_in_shadow_tree(
+        &mut self,
+        shadow_host: E,
+        map: &SelectorMap<Rule>,
+        cascade_level: CascadeLevel,
+    ) {
+        debug_assert!(shadow_host.shadow_root().is_some());
+        let element = self.element;
+        let rule_hash_target = self.rule_hash_target;
+        let rules = &mut self.rules;
+        let flags_setter = &mut self.flags_setter;
+        let shadow_cascade_order = self.shadow_cascade_order;
+        self.context.with_shadow_host(Some(shadow_host), |context| {
+            map.get_all_matching_rules(
+                element,
+                rule_hash_target,
+                rules,
+                context,
+                flags_setter,
+                cascade_level,
+                shadow_cascade_order,
+            );
+        });
+        self.shadow_cascade_order += 1;
+    }
+
+    /// Collects the rules for the ::slotted pseudo-element.
+    fn collect_slotted_rules(&mut self) {
+        let mut slots = SmallVec::<[_; 3]>::new();
+        let mut current = self.rule_hash_target.assigned_slot();
+        while let Some(slot) = current {
+            debug_assert!(
+                self.matches_user_and_author_rules,
+                "We should not slot NAC anywhere"
+            );
+            slots.push(slot);
+            current = slot.assigned_slot();
+        }
+
+        // Match slotted rules in reverse order, so that the outer slotted rules
+        // come before the inner rules (and thus have less priority).
+        for slot in slots.iter().rev() {
+            let shadow = slot.containing_shadow().unwrap();
+            let data = match shadow.style_data() {
+                Some(d) => d,
+                None => continue,
+            };
+            let slotted_rules = match data.slotted_rules(self.pseudo_element) {
+                Some(r) => r,
+                None => continue,
+            };
+            self.collect_rules_in_shadow_tree(
+                shadow.host(),
+                slotted_rules,
+                CascadeLevel::InnerShadowNormal,
+            );
+        }
+    }
+
+    fn collect_normal_rules_from_containing_shadow_tree(&mut self) {
+        if !self.matches_user_and_author_rules {
+            return;
+        }
+
+        let mut current_containing_shadow = self.rule_hash_target.containing_shadow();
+        while let Some(containing_shadow) = current_containing_shadow {
+            let cascade_data = containing_shadow.style_data();
+            let host = containing_shadow.host();
+            if let Some(map) = cascade_data.and_then(|data| data.normal_rules(self.pseudo_element))
+            {
+                self.collect_rules_in_shadow_tree(host, map, CascadeLevel::SameTreeAuthorNormal);
+            }
+            let host_is_svg_use_element =
+                host.is_svg_element() && host.local_name() == &*local_name!("use");
+            if !host_is_svg_use_element {
+                self.matches_document_author_rules = false;
+                break;
+            }
+
+            debug_assert!(
+                cascade_data.is_none(),
+                "We allow no stylesheets in <svg:use> subtrees"
+            );
+
+            // NOTE(emilio): Hack so <svg:use> matches the rules of the
+            // enclosing tree.
+            //
+            // This is not a problem for invalidation and that kind of stuff
+            // because they still don't match rules based on elements
+            // outside of the shadow tree, and because the <svg:use>
+            // subtrees are immutable and recreated each time the source
+            // tree changes.
+            //
+            // We historically allow cross-document <svg:use> to have these
+            // rules applied, but I think that's not great. Gecko is the
+            // only engine supporting that.
+            //
+            // See https://github.com/w3c/svgwg/issues/504 for the relevant
+            // spec discussion.
+            current_containing_shadow = host.containing_shadow();
+            self.matches_document_author_rules = current_containing_shadow.is_none();
+        }
+    }
+
+    /// Collects the rules for the :host pseudo-class.
+    fn collect_host_rules(&mut self) {
+        let shadow = match self.rule_hash_target.shadow_root() {
+            Some(s) => s,
+            None => return,
+        };
+
+        debug_assert!(
+            self.matches_user_and_author_rules,
+            "NAC should not be a shadow host"
+        );
+
+        let style_data = match shadow.style_data() {
+            Some(d) => d,
+            None => return,
+        };
+
+        let host_rules = match style_data.host_rules(self.pseudo_element) {
+            Some(rules) => rules,
+            None => return,
+        };
+
+        let rule_hash_target = self.rule_hash_target;
+        self.collect_rules_in_shadow_tree(
+            rule_hash_target,
+            host_rules,
+            CascadeLevel::InnerShadowNormal,
+        );
+    }
+
+    fn collect_document_author_rules(&mut self) {
+        if !self.matches_document_author_rules {
+            return;
+        }
+
+        self.collect_stylist_rules(Origin::Author);
+    }
+
+    fn collect_xbl_rules(&mut self) {
+        let element = self.element;
+        let cut_xbl_binding_inheritance =
+            element.each_xbl_cascade_data(|cascade_data, quirks_mode| {
+                let map = match cascade_data.normal_rules(self.pseudo_element) {
+                    Some(m) => m,
+                    None => return,
+                };
+
+                // NOTE(emilio): This is needed because the XBL stylist may
+                // think it has a different quirks mode than the document.
+                let mut matching_context = MatchingContext::new(
+                    self.context.matching_mode(),
+                    self.context.bloom_filter,
+                    self.context.nth_index_cache.as_mut().map(|s| &mut **s),
+                    quirks_mode,
+                );
+                matching_context.pseudo_element_matching_fn =
+                    self.context.pseudo_element_matching_fn;
+
+                // SameTreeAuthorNormal instead of InnerShadowNormal to
+                // preserve behavior, though that's kinda fishy...
+                map.get_all_matching_rules(
+                    self.element,
+                    self.rule_hash_target,
+                    self.rules,
+                    &mut matching_context,
+                    self.flags_setter,
+                    CascadeLevel::SameTreeAuthorNormal,
+                    self.shadow_cascade_order,
+                );
+            });
+
+        self.matches_document_author_rules &= !cut_xbl_binding_inheritance;
+    }
+
+    fn collect_style_attribute_and_animation_rules(&mut self) {
+        if let Some(sa) = self.style_attribute {
+            self.rules
+                .push(ApplicableDeclarationBlock::from_declarations(
+                    sa.clone_arc(),
+                    CascadeLevel::StyleAttributeNormal,
+                ));
+        }
+
+        if let Some(so) = self.smil_override {
+            self.rules
+                .push(ApplicableDeclarationBlock::from_declarations(
+                    so.clone_arc(),
+                    CascadeLevel::SMILOverride,
+                ));
+        }
+
+        // The animations sheet (CSS animations, script-generated
+        // animations, and CSS transitions that are no longer tied to CSS
+        // markup).
+        if let Some(anim) = self.animation_rules.0.take() {
+            self.rules
+                .push(ApplicableDeclarationBlock::from_declarations(
+                    anim,
+                    CascadeLevel::Animations,
+                ));
+        }
+
+        // The transitions sheet (CSS transitions that are tied to CSS
+        // markup).
+        if let Some(anim) = self.animation_rules.1.take() {
+            self.rules
+                .push(ApplicableDeclarationBlock::from_declarations(
+                    anim,
+                    CascadeLevel::Transitions,
+                ));
+        }
+    }
+
+    /// Collects all the rules, leaving the result in `self.rules`.
+    ///
+    /// Note that `!important` rules are handled during rule tree insertion.
+    pub fn collect_all(mut self) {
+        self.collect_user_agent_rules();
+        self.collect_user_rules();
+        if self.rule_inclusion == RuleInclusion::DefaultOnly {
+            return;
+        }
+        self.collect_presentational_hints();
+        // FIXME(emilio): Should the author styles enabled stuff avoid the
+        // presentational hints from getting pushed? See bug 1505770.
+        if self.stylist.author_styles_enabled() == AuthorStylesEnabled::No {
+            return;
+        }
+        self.collect_host_rules();
+        self.collect_slotted_rules();
+        self.collect_normal_rules_from_containing_shadow_tree();
+        self.collect_xbl_rules();
+        self.collect_document_author_rules();
+        self.collect_style_attribute_and_animation_rules();
+    }
+}
diff --git a/servo/components/style/stylist.rs b/servo/components/style/stylist.rs
index cd6ed7257e57..fea1a130884c 100644
--- a/servo/components/style/stylist.rs
+++ b/servo/components/style/stylist.rs
@@ -23,6 +23,7 @@ use properties::{self, CascadeMode, ComputedValues};
 use properties::{AnimationRules, PropertyDeclarationBlock};
 use rule_cache::{RuleCache, RuleCacheConditions};
 use rule_tree::{CascadeLevel, RuleTree, ShadowCascadeOrder, StrongRuleNode, StyleSource};
+use rule_collector::RuleCollector;
 use selector_map::{PrecomputedHashMap, PrecomputedHashSet, SelectorMap, SelectorMapEntry};
 use selector_parser::{PerPseudoElementMap, PseudoElement, SelectorImpl, SnapshotMap};
 use selectors::attr::{CaseSensitivity, NamespaceConstraint};
@@ -36,7 +37,6 @@ use selectors::NthIndexCache;
 use servo_arc::{Arc, ArcBorrow};
 use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};
 use smallbitvec::SmallBitVec;
-use smallvec::SmallVec;
 use std::ops;
 use std::sync::Mutex;
 use style_traits::viewport::ViewportConstraints;
@@ -180,10 +180,11 @@ impl UserAgentCascadeData {
     }
 }
 
-/// All the computed information for a stylesheet.
+/// All the computed information for all the stylesheets that apply to the
+/// document.
 #[derive(Default)]
 #[cfg_attr(feature = "servo", derive(MallocSizeOf))]
-struct DocumentCascadeData {
+pub struct DocumentCascadeData {
     #[cfg_attr(
         feature = "servo",
         ignore_malloc_size_of = "Arc, owned by UserAgentCascadeDataCache"
@@ -210,7 +211,9 @@ impl<'a> Iterator for DocumentCascadeDataIter<'a> {
 }
 
 impl DocumentCascadeData {
-    fn borrow_for_origin(&self, origin: Origin) -> &CascadeData {
+    /// Borrows the cascade data for a given origin.
+    #[inline]
+    pub fn borrow_for_origin(&self, origin: Origin) -> &CascadeData {
         match origin {
             Origin::UserAgent => &self.user_agent.cascade_data,
             Origin::Author => &self.author,
@@ -412,10 +415,16 @@ impl Stylist {
         }
     }
 
-    /// Returns the cascade data for the author level.
+    /// Returns the document cascade data.
     #[inline]
-    pub fn author_cascade_data(&self) -> &CascadeData {
-        &self.cascade_data.author
+    pub fn cascade_data(&self) -> &DocumentCascadeData {
+        &self.cascade_data
+    }
+
+    /// Returns whether author styles are enabled or not.
+    #[inline]
+    pub fn author_styles_enabled(&self) -> AuthorStylesEnabled {
+        self.author_styles_enabled
     }
 
     /// Iterate through all the cascade datas from the document.
@@ -1098,11 +1107,6 @@ impl Stylist {
     }
 
     /// Returns the applicable CSS declarations for the given element.
-    ///
-    /// This corresponds to `ElementRuleCollector` in WebKit, and should push to
-    /// elements in the list in the order defined by:
-    ///
-    /// https://drafts.csswg.org/css-cascade/#cascade-origin
     pub fn push_applicable_declarations<E, F>(
         &self,
         element: E,
@@ -1118,284 +1122,18 @@ impl Stylist {
         E: TElement,
         F: FnMut(&E, ElementSelectorFlags),
     {
-        // Gecko definitely has pseudo-elements with style attributes, like
-        // ::-moz-color-swatch.
-        debug_assert!(
-            cfg!(feature = "gecko") || style_attribute.is_none() || pseudo_element.is_none(),
-            "Style attributes do not apply to pseudo-elements"
-        );
-        debug_assert!(pseudo_element.map_or(true, |p| !p.is_precomputed()));
-
-        let rule_hash_target = element.rule_hash_target();
-
-        let matches_user_and_author_rules = rule_hash_target.matches_user_and_author_rules();
-
-        // Normal user-agent rules.
-        if let Some(map) = self
-            .cascade_data
-            .user_agent
-            .cascade_data
-            .normal_rules(pseudo_element)
-        {
-            map.get_all_matching_rules(
-                element,
-                rule_hash_target,
-                applicable_declarations,
-                context,
-                flags_setter,
-                CascadeLevel::UANormal,
-                0,
-            );
-        }
-
-        // NB: the following condition, although it may look somewhat
-        // inaccurate, would be equivalent to something like:
-        //
-        //     element.matches_user_and_author_rules() ||
-        //     (is_implemented_pseudo &&
-        //      rule_hash_target.matches_user_and_author_rules())
-        //
-        // Which may be more what you would probably expect.
-        if matches_user_and_author_rules {
-            // User normal rules.
-            if let Some(map) = self.cascade_data.user.normal_rules(pseudo_element) {
-                map.get_all_matching_rules(
-                    element,
-                    rule_hash_target,
-                    applicable_declarations,
-                    context,
-                    flags_setter,
-                    CascadeLevel::UserNormal,
-                    0,
-                );
-            }
-        }
-
-        if rule_inclusion == RuleInclusion::DefaultOnly {
-            return;
-        }
-
-        if pseudo_element.is_none() {
-            // Presentational hints.
-            //
-            // These go before author rules, but after user rules, see:
-            // https://drafts.csswg.org/css-cascade/#preshint
-            let length_before_preshints = applicable_declarations.len();
-            element.synthesize_presentational_hints_for_legacy_attributes(
-                context.visited_handling(),
-                applicable_declarations,
-            );
-            if cfg!(debug_assertions) {
-                if applicable_declarations.len() != length_before_preshints {
-                    for declaration in &applicable_declarations[length_before_preshints..] {
-                        assert_eq!(declaration.level(), CascadeLevel::PresHints);
-                    }
-                }
-            }
-        }
-
-        if self.author_styles_enabled == AuthorStylesEnabled::No {
-            return;
-        }
-
-        let mut match_document_author_rules = matches_user_and_author_rules;
-        let mut shadow_cascade_order = 0;
-
-        // XBL / Shadow DOM rules, which are author rules too.
-        if let Some(shadow) = rule_hash_target.shadow_root() {
-            debug_assert!(
-                matches_user_and_author_rules,
-                "NAC should not be a shadow host"
-            );
-            if let Some(map) = shadow
-                .style_data()
-                .and_then(|data| data.host_rules(pseudo_element))
-            {
-                context.with_shadow_host(Some(rule_hash_target), |context| {
-                    map.get_all_matching_rules(
-                        element,
-                        rule_hash_target,
-                        applicable_declarations,
-                        context,
-                        flags_setter,
-                        CascadeLevel::InnerShadowNormal,
-                        shadow_cascade_order,
-                    );
-                });
-                shadow_cascade_order += 1;
-            }
-        }
-
-        // Match slotted rules in reverse order, so that the outer slotted
-        // rules come before the inner rules (and thus have less priority).
-        let mut slots = SmallVec::<[_; 3]>::new();
-        let mut current = rule_hash_target.assigned_slot();
-        while let Some(slot) = current {
-            debug_assert!(
-                matches_user_and_author_rules,
-                "We should not slot NAC anywhere"
-            );
-            slots.push(slot);
-            current = slot.assigned_slot();
-        }
-
-        for slot in slots.iter().rev() {
-            let shadow = slot.containing_shadow().unwrap();
-            if let Some(map) = shadow
-                .style_data()
-                .and_then(|data| data.slotted_rules(pseudo_element))
-            {
-                context.with_shadow_host(Some(shadow.host()), |context| {
-                    map.get_all_matching_rules(
-                        element,
-                        rule_hash_target,
-                        applicable_declarations,
-                        context,
-                        flags_setter,
-                        CascadeLevel::InnerShadowNormal,
-                        shadow_cascade_order,
-                    );
-                });
-                shadow_cascade_order += 1;
-            }
-        }
-
-        if matches_user_and_author_rules {
-            let mut current_containing_shadow = rule_hash_target.containing_shadow();
-            while let Some(containing_shadow) = current_containing_shadow {
-                let cascade_data = containing_shadow.style_data();
-                let host = containing_shadow.host();
-                if let Some(map) = cascade_data.and_then(|data| data.normal_rules(pseudo_element)) {
-                    context.with_shadow_host(Some(host), |context| {
-                        map.get_all_matching_rules(
-                            element,
-                            rule_hash_target,
-                            applicable_declarations,
-                            context,
-                            flags_setter,
-                            CascadeLevel::SameTreeAuthorNormal,
-                            shadow_cascade_order,
-                        );
-                    });
-                    shadow_cascade_order += 1;
-                }
-
-                let host_is_svg_use_element =
-                    host.is_svg_element() && host.local_name() == &*local_name!("use");
-
-                if !host_is_svg_use_element {
-                    match_document_author_rules = false;
-                    break;
-                }
-
-                debug_assert!(
-                    cascade_data.is_none(),
-                    "We allow no stylesheets in <svg:use> subtrees"
-                );
-
-                // NOTE(emilio): Hack so <svg:use> matches the rules of the
-                // enclosing tree.
-                //
-                // This is not a problem for invalidation and that kind of stuff
-                // because they still don't match rules based on elements
-                // outside of the shadow tree, and because the <svg:use>
-                // subtrees are immutable and recreated each time the source
-                // tree changes.
-                //
-                // We historically allow cross-document <svg:use> to have these
-                // rules applied, but I think that's not great. Gecko is the
-                // only engine supporting that.
-                //
-                // See https://github.com/w3c/svgwg/issues/504 for the relevant
-                // spec discussion.
-                current_containing_shadow = host.containing_shadow();
-                match_document_author_rules = current_containing_shadow.is_none();
-            }
-        }
-
-        let cut_xbl_binding_inheritance =
-            element.each_xbl_cascade_data(|cascade_data, quirks_mode| {
-                if let Some(map) = cascade_data.normal_rules(pseudo_element) {
-                    // NOTE(emilio): This is needed because the XBL stylist may
-                    // think it has a different quirks mode than the document.
-                    let mut matching_context = MatchingContext::new(
-                        context.matching_mode(),
-                        context.bloom_filter,
-                        context.nth_index_cache.as_mut().map(|s| &mut **s),
-                        quirks_mode,
-                    );
-                    matching_context.pseudo_element_matching_fn =
-                        context.pseudo_element_matching_fn;
-
-                    // SameTreeAuthorNormal instead of InnerShadowNormal to
-                    // preserve behavior, though that's kinda fishy...
-                    map.get_all_matching_rules(
-                        element,
-                        rule_hash_target,
-                        applicable_declarations,
-                        &mut matching_context,
-                        flags_setter,
-                        CascadeLevel::SameTreeAuthorNormal,
-                        shadow_cascade_order,
-                    );
-                }
-            });
-
-        match_document_author_rules &= !cut_xbl_binding_inheritance;
-
-        if match_document_author_rules {
-            // Author normal rules.
-            if let Some(map) = self.cascade_data.author.normal_rules(pseudo_element) {
-                map.get_all_matching_rules(
-                    element,
-                    rule_hash_target,
-                    applicable_declarations,
-                    context,
-                    flags_setter,
-                    CascadeLevel::SameTreeAuthorNormal,
-                    shadow_cascade_order,
-                );
-            }
-        }
-
-        // Style attribute ("Normal override declarations").
-        if let Some(sa) = style_attribute {
-            applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
-                sa.clone_arc(),
-                CascadeLevel::StyleAttributeNormal,
-            ));
-        }
-
-        // Declarations from SVG SMIL animation elements.
-        if let Some(so) = smil_override {
-            applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
-                so.clone_arc(),
-                CascadeLevel::SMILOverride,
-            ));
-        }
-
-        // The animations sheet (CSS animations, script-generated
-        // animations, and CSS transitions that are no longer tied to CSS
-        // markup).
-        if let Some(anim) = animation_rules.0 {
-            applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
-                anim.clone(),
-                CascadeLevel::Animations,
-            ));
-        }
-
-        //
-        // !important rules are handled during rule tree insertion.
-        //
-
-        // The transitions sheet (CSS transitions that are tied to CSS
-        // markup).
-        if let Some(anim) = animation_rules.1 {
-            applicable_declarations.push(ApplicableDeclarationBlock::from_declarations(
-                anim.clone(),
-                CascadeLevel::Transitions,
-            ));
-        }
+        RuleCollector::new(
+            self,
+            element,
+            pseudo_element,
+            style_attribute,
+            smil_override,
+            animation_rules,
+            rule_inclusion,
+            applicable_declarations,
+            context,
+            flags_setter,
+        ).collect_all();
     }
 
     /// Given an id, returns whether there might be any rules for that id in any
@@ -2100,18 +1838,21 @@ impl CascadeData {
         self.attribute_dependencies.contains(local_name)
     }
 
+    /// Returns the normal rule map for a given pseudo-element.
     #[inline]
-    fn normal_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
+    pub fn normal_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
         self.normal_rules.rules(pseudo)
     }
 
+    /// Returns the host pseudo rule map for a given pseudo-element.
     #[inline]
-    fn host_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
+    pub fn host_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
         self.host_rules.as_ref().and_then(|d| d.rules(pseudo))
     }
 
+    /// Returns the slotted rule map for a given pseudo-element.
     #[inline]
-    fn slotted_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
+    pub fn slotted_rules(&self, pseudo: Option<&PseudoElement>) -> Option<&SelectorMap<Rule>> {
         self.slotted_rules.as_ref().and_then(|d| d.rules(pseudo))
     }
 

From b3905b1d5b9d80e0808fef857b1dda7f5d3835ae Mon Sep 17 00:00:00 2001
From: Daisuke Akatsuka <dakatsuka@mozilla.com>
Date: Fri, 9 Nov 2018 02:23:14 +0000
Subject: [PATCH 77/77] Bug 1497448: Update usb devices when the debugger
 client of usb was closed. r=jdescottes

Depends on D9889

Differential Revision: https://phabricator.services.mozilla.com/D9890

--HG--
extra : moz-landing-system : lando
---
 .../src/actions/runtimes.js                   | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/devtools/client/aboutdebugging-new/src/actions/runtimes.js b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
index 04fbc0cdfb13..3c5e05d8537e 100644
--- a/devtools/client/aboutdebugging-new/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging-new/src/actions/runtimes.js
@@ -93,6 +93,13 @@ async function getRuntimeInfo(runtime, client) {
   };
 }
 
+function onUSBDebuggerClientClosed() {
+  // After scanUSBRuntimes action, updateUSBRuntimes action is called.
+  // The closed runtime will be unwatched and disconnected explicitly in the action
+  // if needed.
+  window.AboutDebugging.store.dispatch(Actions.scanUSBRuntimes());
+}
+
 function connectRuntime(id) {
   return async (dispatch, getState) => {
     dispatch({ type: CONNECT_RUNTIME_START });
@@ -105,6 +112,12 @@ function connectRuntime(id) {
         await preferenceFront.getBoolPref(RUNTIME_PREFERENCE.CONNECTION_PROMPT);
       const runtimeDetails = { connectionPromptEnabled, client, info, transportDetails };
 
+      if (runtime.type === RUNTIMES.USB) {
+        // `closed` event will be emitted when disabling remote debugging
+        // on the connected USB runtime.
+        client.addOneTimeListener("closed", onUSBDebuggerClientClosed);
+      }
+
       dispatch({
         type: CONNECT_RUNTIME_SUCCESS,
         runtime: {
@@ -126,8 +139,15 @@ function disconnectRuntime(id) {
       const runtime = findRuntimeById(id, getState().runtimes);
       const client = runtime.runtimeDetails.client;
 
+      if (runtime.type === RUNTIMES.USB) {
+        client.removeListener("closed", onUSBDebuggerClientClosed);
+      }
+
       await client.close();
-      DebuggerServer.destroy();
+
+      if (runtime.type === RUNTIMES.THIS_FIREFOX) {
+        DebuggerServer.destroy();
+      }
 
       dispatch({
         type: DISCONNECT_RUNTIME_SUCCESS,
@@ -232,6 +252,13 @@ function updateUSBRuntimes(runtimes) {
       await dispatch(Actions.selectPage(RUNTIMES.THIS_FIREFOX, RUNTIMES.THIS_FIREFOX));
     }
 
+    // Disconnect runtimes that were no longer valid
+    const invalidRuntimes =
+      getState().runtimes.usbRuntimes.filter(r => !runtimes.includes(r));
+    for (const invalidRuntime of invalidRuntimes) {
+      await dispatch(disconnectRuntime(invalidRuntime.id));
+    }
+
     dispatch({ type: USB_RUNTIMES_UPDATED, runtimes });
   };
 }