diff --git a/.prettierignore b/.prettierignore
index b41b89fd2492..16092242e36b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1000,6 +1000,8 @@ uriloader/exthandler/tests/mochitest/save_filenames.html
 # Also ignore reftest - specially crafted to produce expected output.
 **/reftest/
 **/reftests/
+# Don't ignore the reftest harness files.
+!/layout/tools/reftest/
 
 # Exclude expected objdirs.
 obj*/
diff --git a/layout/tools/reftest/ReftestFissionChild.jsm b/layout/tools/reftest/ReftestFissionChild.jsm
index 97037d1fafcc..bcf7dfac9c5c 100644
--- a/layout/tools/reftest/ReftestFissionChild.jsm
+++ b/layout/tools/reftest/ReftestFissionChild.jsm
@@ -1,20 +1,28 @@
 var EXPORTED_SYMBOLS = ["ReftestFissionChild"];
 
 class ReftestFissionChild extends JSWindowActorChild {
-
-  forwardAfterPaintEventToParent(rects, originalTargetUri, dispatchToSelfAsWell) {
+  forwardAfterPaintEventToParent(
+    rects,
+    originalTargetUri,
+    dispatchToSelfAsWell
+  ) {
     if (dispatchToSelfAsWell) {
-      let event = new this.contentWindow.CustomEvent("Reftest:MozAfterPaintFromChild",
-        {bubbles: true, detail: {rects, originalTargetUri}});
+      let event = new this.contentWindow.CustomEvent(
+        "Reftest:MozAfterPaintFromChild",
+        { bubbles: true, detail: { rects, originalTargetUri } }
+      );
       this.contentWindow.dispatchEvent(event);
     }
 
     let parentContext = this.browsingContext.parent;
     if (parentContext) {
       try {
-        this.sendAsyncMessage("ForwardAfterPaintEvent",
-          {toBrowsingContext: parentContext, fromBrowsingContext: this.browsingContext,
-           rects, originalTargetUri});
+        this.sendAsyncMessage("ForwardAfterPaintEvent", {
+          toBrowsingContext: parentContext,
+          fromBrowsingContext: this.browsingContext,
+          rects,
+          originalTargetUri,
+        });
       } catch (e) {
         // |this| can be destroyed here and unable to send messages, which is
         // not a problem, the reftest harness probably torn down the page and
@@ -32,24 +40,33 @@ class ReftestFissionChild extends JSWindowActorChild {
         // code (reftest-content.js) will process it and update the canvas.
         var rects = [];
         for (let r of evt.clientRects) {
-            rects.push({ left: r.left, top: r.top, right: r.right, bottom: r.bottom });
+          rects.push({
+            left: r.left,
+            top: r.top,
+            right: r.right,
+            bottom: r.bottom,
+          });
         }
-        this.forwardAfterPaintEventToParent(rects, this.document.documentURI, /* dispatchToSelfAsWell */ false);
+        this.forwardAfterPaintEventToParent(
+          rects,
+          this.document.documentURI,
+          /* dispatchToSelfAsWell */ false
+        );
         break;
     }
   }
 
   transformRect(transform, rect) {
-    let p1 = transform.transformPoint({x: rect.left, y: rect.top});
-    let p2 = transform.transformPoint({x: rect.right, y: rect.top});
-    let p3 = transform.transformPoint({x: rect.left, y: rect.bottom});
-    let p4 = transform.transformPoint({x: rect.right, y: rect.bottom});
+    let p1 = transform.transformPoint({ x: rect.left, y: rect.top });
+    let p2 = transform.transformPoint({ x: rect.right, y: rect.top });
+    let p3 = transform.transformPoint({ x: rect.left, y: rect.bottom });
+    let p4 = transform.transformPoint({ x: rect.right, y: rect.bottom });
     let quad = new DOMQuad(p1, p2, p3, p4);
     return quad.getBounds();
   }
 
   SetupDisplayportRoot() {
-    let returnStrings = {infoStrings: [], errorStrings: []};
+    let returnStrings = { infoStrings: [], errorStrings: [] };
 
     let contentRootElement = this.contentWindow.document.documentElement;
     if (!contentRootElement) {
@@ -60,31 +77,43 @@ class ReftestFissionChild extends JSWindowActorChild {
     // the root element for potential display ports to set.
     if (!contentRootElement.hasAttribute("reftest-async-scroll")) {
       let winUtils = this.contentWindow.windowUtils;
-      this.setupDisplayportForElement(contentRootElement, winUtils, returnStrings);
+      this.setupDisplayportForElement(
+        contentRootElement,
+        winUtils,
+        returnStrings
+      );
       return Promise.resolve(returnStrings);
     }
 
     // Send a msg to the parent side to get the parent side to tell all
     // process roots to do the displayport setting.
     let browsingContext = this.browsingContext;
-    let promise = this.sendQuery("TellChildrenToSetupDisplayport", {browsingContext});
-    return promise.then(function(result) {
-      for (let errorString of result.errorStrings) {
-          returnStrings.errorStrings.push(errorString);
-      }
-      for (let infoString of result.infoStrings) {
-          returnStrings.infoStrings.push(infoString);
-      }
-      return returnStrings;
-    },
-    function(reason) {
-      returnStrings.errorStrings.push("SetupDisplayport SendQuery to parent promise rejected: " + reason);
-      return returnStrings;
+    let promise = this.sendQuery("TellChildrenToSetupDisplayport", {
+      browsingContext,
     });
+    return promise.then(
+      function (result) {
+        for (let errorString of result.errorStrings) {
+          returnStrings.errorStrings.push(errorString);
+        }
+        for (let infoString of result.infoStrings) {
+          returnStrings.infoStrings.push(infoString);
+        }
+        return returnStrings;
+      },
+      function (reason) {
+        returnStrings.errorStrings.push(
+          "SetupDisplayport SendQuery to parent promise rejected: " + reason
+        );
+        return returnStrings;
+      }
+    );
   }
 
   attrOrDefault(element, attr, def) {
-    return element.hasAttribute(attr) ? Number(element.getAttribute(attr)) : def;
+    return element.hasAttribute(attr)
+      ? Number(element.getAttribute(attr))
+      : def;
   }
 
   setupDisplayportForElement(element, winUtils, returnStrings) {
@@ -93,7 +122,17 @@ class ReftestFissionChild extends JSWindowActorChild {
     var dpx = this.attrOrDefault(element, "reftest-displayport-x", 0);
     var dpy = this.attrOrDefault(element, "reftest-displayport-y", 0);
     if (dpw !== 0 || dph !== 0 || dpx != 0 || dpy != 0) {
-      returnStrings.infoStrings.push("Setting displayport to <x="+ dpx +", y="+ dpy +", w="+ dpw +", h="+ dph +">");
+      returnStrings.infoStrings.push(
+        "Setting displayport to <x=" +
+          dpx +
+          ", y=" +
+          dpy +
+          ", w=" +
+          dpw +
+          ", h=" +
+          dph +
+          ">"
+      );
       winUtils.setDisplayPortForElement(dpx, dpy, dpw, dph, element, 1);
     }
   }
@@ -103,87 +142,140 @@ class ReftestFissionChild extends JSWindowActorChild {
     for (let c = element.firstElementChild; c; c = c.nextElementSibling) {
       this.setupDisplayportForElementSubtree(c, winUtils, returnStrings);
     }
-    if (typeof element.contentDocument !== "undefined" &&
-        element.contentDocument) {
-      returnStrings.infoStrings.push("setupDisplayportForElementSubtree descending into subdocument");
-      this.setupDisplayportForElementSubtree(element.contentDocument.documentElement,
-        element.contentWindow.windowUtils, returnStrings);
+    if (
+      typeof element.contentDocument !== "undefined" &&
+      element.contentDocument
+    ) {
+      returnStrings.infoStrings.push(
+        "setupDisplayportForElementSubtree descending into subdocument"
+      );
+      this.setupDisplayportForElementSubtree(
+        element.contentDocument.documentElement,
+        element.contentWindow.windowUtils,
+        returnStrings
+      );
     }
   }
 
-    setupAsyncScrollOffsetsForElement(element, winUtils, allowFailure, returnStrings) {
-      let sx = this.attrOrDefault(element, "reftest-async-scroll-x", 0);
-      let sy = this.attrOrDefault(element, "reftest-async-scroll-y", 0);
-      if (sx != 0 || sy != 0) {
-        try {
-          // This might fail when called from RecordResult since layers
-          // may not have been constructed yet
-          winUtils.setAsyncScrollOffset(element, sx, sy);
-          return true;
-        } catch (e) {
-          if (allowFailure) {
-            returnStrings.infoStrings.push("setupAsyncScrollOffsetsForElement error calling setAsyncScrollOffset: " + e);
-          } else {
-            returnStrings.errorStrings.push("setupAsyncScrollOffsetsForElement error calling setAsyncScrollOffset: " + e);
-          }
+  setupAsyncScrollOffsetsForElement(
+    element,
+    winUtils,
+    allowFailure,
+    returnStrings
+  ) {
+    let sx = this.attrOrDefault(element, "reftest-async-scroll-x", 0);
+    let sy = this.attrOrDefault(element, "reftest-async-scroll-y", 0);
+    if (sx != 0 || sy != 0) {
+      try {
+        // This might fail when called from RecordResult since layers
+        // may not have been constructed yet
+        winUtils.setAsyncScrollOffset(element, sx, sy);
+        return true;
+      } catch (e) {
+        if (allowFailure) {
+          returnStrings.infoStrings.push(
+            "setupAsyncScrollOffsetsForElement error calling setAsyncScrollOffset: " +
+              e
+          );
+        } else {
+          returnStrings.errorStrings.push(
+            "setupAsyncScrollOffsetsForElement error calling setAsyncScrollOffset: " +
+              e
+          );
         }
       }
-      return false;
     }
+    return false;
+  }
 
-    setupAsyncScrollOffsetsForElementSubtree(element, winUtils, allowFailure, returnStrings) {
-      let updatedAny = this.setupAsyncScrollOffsetsForElement(element, winUtils, returnStrings);
-      for (let c = element.firstElementChild; c; c = c.nextElementSibling) {
-        if (this.setupAsyncScrollOffsetsForElementSubtree(c, winUtils, allowFailure, returnStrings)) {
-          updatedAny = true;
-        }
+  setupAsyncScrollOffsetsForElementSubtree(
+    element,
+    winUtils,
+    allowFailure,
+    returnStrings
+  ) {
+    let updatedAny = this.setupAsyncScrollOffsetsForElement(
+      element,
+      winUtils,
+      returnStrings
+    );
+    for (let c = element.firstElementChild; c; c = c.nextElementSibling) {
+      if (
+        this.setupAsyncScrollOffsetsForElementSubtree(
+          c,
+          winUtils,
+          allowFailure,
+          returnStrings
+        )
+      ) {
+        updatedAny = true;
       }
-      if (typeof element.contentDocument !== "undefined" &&
-          element.contentDocument) {
-        returnStrings.infoStrings.push("setupAsyncScrollOffsetsForElementSubtree Descending into subdocument");
-        if (this.setupAsyncScrollOffsetsForElementSubtree(element.contentDocument.documentElement,
-              element.contentWindow.windowUtils, allowFailure, returnStrings)) {
-          updatedAny = true;
-        }
-      }
-      return updatedAny;
     }
+    if (
+      typeof element.contentDocument !== "undefined" &&
+      element.contentDocument
+    ) {
+      returnStrings.infoStrings.push(
+        "setupAsyncScrollOffsetsForElementSubtree Descending into subdocument"
+      );
+      if (
+        this.setupAsyncScrollOffsetsForElementSubtree(
+          element.contentDocument.documentElement,
+          element.contentWindow.windowUtils,
+          allowFailure,
+          returnStrings
+        )
+      ) {
+        updatedAny = true;
+      }
+    }
+    return updatedAny;
+  }
 
   async receiveMessage(msg) {
     switch (msg.name) {
-      case "ForwardAfterPaintEventToSelfAndParent":
-      {
+      case "ForwardAfterPaintEventToSelfAndParent": {
         // The embedderElement can be null if the child we got this from was removed.
         // Not much we can do to transform the rects, but it doesn't matter, the rects
         // won't reach reftest-content.js.
         if (msg.data.fromBrowsingContext.embedderElement == null) {
-          this.forwardAfterPaintEventToParent(msg.data.rects, msg.data.originalTargetUri,
-            /* dispatchToSelfAsWell */ true);
+          this.forwardAfterPaintEventToParent(
+            msg.data.rects,
+            msg.data.originalTargetUri,
+            /* dispatchToSelfAsWell */ true
+          );
           return;
         }
 
         // Transform the rects from fromBrowsingContext to us.
         // We first translate from the content rect to the border rect of the iframe.
-        let style = this.contentWindow.getComputedStyle(msg.data.fromBrowsingContext.embedderElement);
+        let style = this.contentWindow.getComputedStyle(
+          msg.data.fromBrowsingContext.embedderElement
+        );
         let translate = new DOMMatrixReadOnly().translate(
           parseFloat(style.paddingLeft) + parseFloat(style.borderLeftWidth),
-          parseFloat(style.paddingTop) + parseFloat(style.borderTopWidth));
+          parseFloat(style.paddingTop) + parseFloat(style.borderTopWidth)
+        );
 
         // Then we transform from the iframe to our root frame.
         // We are guaranteed to be the process with the embedderElement for fromBrowsingContext.
-        let transform = msg.data.fromBrowsingContext.embedderElement.getTransformToViewport();
+        let transform =
+          msg.data.fromBrowsingContext.embedderElement.getTransformToViewport();
         let combined = translate.multiply(transform);
 
-        let newrects = msg.data.rects.map(r => this.transformRect(combined, r))
+        let newrects = msg.data.rects.map(r => this.transformRect(combined, r));
 
-        this.forwardAfterPaintEventToParent(newrects, msg.data.originalTargetUri, /* dispatchToSelfAsWell */ true);
+        this.forwardAfterPaintEventToParent(
+          newrects,
+          msg.data.originalTargetUri,
+          /* dispatchToSelfAsWell */ true
+        );
         break;
       }
 
       case "EmptyMessage":
         return undefined;
-      case "UpdateLayerTree":
-      {
+      case "UpdateLayerTree": {
         let errorStrings = [];
         try {
           if (this.manager.isProcessRoot) {
@@ -192,22 +284,23 @@ class ReftestFissionChild extends JSWindowActorChild {
         } catch (e) {
           errorStrings.push("updateLayerTree failed: " + e);
         }
-        return {errorStrings};
+        return { errorStrings };
       }
-      case "FlushRendering":
-      {
+      case "FlushRendering": {
         let errorStrings = [];
         let warningStrings = [];
         let infoStrings = [];
 
         try {
-          let {ignoreThrottledAnimations, needsAnimationFrame} = msg.data;
+          let { ignoreThrottledAnimations, needsAnimationFrame } = msg.data;
 
           if (this.manager.isProcessRoot) {
             var anyPendingPaintsGeneratedInDescendants = false;
 
             if (needsAnimationFrame) {
-              await new Promise(resolve => this.contentWindow.requestAnimationFrame(resolve));
+              await new Promise(resolve =>
+                this.contentWindow.requestAnimationFrame(resolve)
+              );
             }
 
             function flushWindow(win) {
@@ -228,7 +321,10 @@ class ReftestFissionChild extends JSWindowActorChild {
               }
 
               if (!afterPaintWasPending && utils.isMozAfterPaintPending) {
-                infoStrings.push("FlushRendering generated paint for window " + win.location.href);
+                infoStrings.push(
+                  "FlushRendering generated paint for window " +
+                    win.location.href
+                );
                 anyPendingPaintsGeneratedInDescendants = true;
               }
 
@@ -249,32 +345,37 @@ class ReftestFissionChild extends JSWindowActorChild {
               flushWindow(this.contentWindow);
             }
 
-            if (anyPendingPaintsGeneratedInDescendants &&
-                !this.contentWindow.windowUtils.isMozAfterPaintPending) {
-              warningStrings.push("Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!");
+            if (
+              anyPendingPaintsGeneratedInDescendants &&
+              !this.contentWindow.windowUtils.isMozAfterPaintPending
+            ) {
+              warningStrings.push(
+                "Internal error: descendant frame generated a MozAfterPaint event, but the root document doesn't have one!"
+              );
             }
-
           }
         } catch (e) {
           errorStrings.push("flushWindow failed: " + e);
         }
-        return {errorStrings, warningStrings, infoStrings};
+        return { errorStrings, warningStrings, infoStrings };
       }
 
-      case "SetupDisplayport":
-      {
+      case "SetupDisplayport": {
         let contentRootElement = this.document.documentElement;
         let winUtils = this.contentWindow.windowUtils;
-        let returnStrings = {infoStrings: [], errorStrings: []};
+        let returnStrings = { infoStrings: [], errorStrings: [] };
         if (contentRootElement) {
-          this.setupDisplayportForElementSubtree(contentRootElement, winUtils, returnStrings);
+          this.setupDisplayportForElementSubtree(
+            contentRootElement,
+            winUtils,
+            returnStrings
+          );
         }
         return returnStrings;
       }
 
-      case "SetupAsyncScrollOffsets":
-      {
-        let returns = {infoStrings: [], errorStrings: [], updatedAny: false};
+      case "SetupAsyncScrollOffsets": {
+        let returns = { infoStrings: [], errorStrings: [], updatedAny: false };
         let contentRootElement = this.document.documentElement;
 
         if (!contentRootElement) {
@@ -283,10 +384,14 @@ class ReftestFissionChild extends JSWindowActorChild {
 
         let winUtils = this.contentWindow.windowUtils;
 
-        returns.updatedAny = this.setupAsyncScrollOffsetsForElementSubtree(contentRootElement, winUtils, msg.data.allowFailure, returns);
+        returns.updatedAny = this.setupAsyncScrollOffsetsForElementSubtree(
+          contentRootElement,
+          winUtils,
+          msg.data.allowFailure,
+          returns
+        );
         return returns;
       }
-
     }
   }
 }
diff --git a/layout/tools/reftest/ReftestFissionParent.jsm b/layout/tools/reftest/ReftestFissionParent.jsm
index 7cf61bdd5516..ecd9d1a08228 100644
--- a/layout/tools/reftest/ReftestFissionParent.jsm
+++ b/layout/tools/reftest/ReftestFissionParent.jsm
@@ -1,25 +1,46 @@
 var EXPORTED_SYMBOLS = ["ReftestFissionParent"];
 
 class ReftestFissionParent extends JSWindowActorParent {
-
-  tellChildrenToFlushRendering(browsingContext, ignoreThrottledAnimations, needsAnimationFrame) {
+  tellChildrenToFlushRendering(
+    browsingContext,
+    ignoreThrottledAnimations,
+    needsAnimationFrame
+  ) {
     let promises = [];
-    this.tellChildrenToFlushRenderingRecursive(browsingContext, ignoreThrottledAnimations, needsAnimationFrame, promises);
+    this.tellChildrenToFlushRenderingRecursive(
+      browsingContext,
+      ignoreThrottledAnimations,
+      needsAnimationFrame,
+      promises
+    );
     return Promise.allSettled(promises);
   }
 
-  tellChildrenToFlushRenderingRecursive(browsingContext, ignoreThrottledAnimations, needsAnimationFrame, promises) {
+  tellChildrenToFlushRenderingRecursive(
+    browsingContext,
+    ignoreThrottledAnimations,
+    needsAnimationFrame,
+    promises
+  ) {
     let cwg = browsingContext.currentWindowGlobal;
     if (cwg && cwg.isProcessRoot) {
       let a = cwg.getActor("ReftestFission");
       if (a) {
-        let responsePromise = a.sendQuery("FlushRendering", {ignoreThrottledAnimations, needsAnimationFrame});
+        let responsePromise = a.sendQuery("FlushRendering", {
+          ignoreThrottledAnimations,
+          needsAnimationFrame,
+        });
         promises.push(responsePromise);
       }
     }
 
     for (let context of browsingContext.children) {
-      this.tellChildrenToFlushRenderingRecursive(context, ignoreThrottledAnimations, needsAnimationFrame, promises);
+      this.tellChildrenToFlushRenderingRecursive(
+        context,
+        ignoreThrottledAnimations,
+        needsAnimationFrame,
+        promises
+      );
     }
   }
 
@@ -51,14 +72,16 @@ class ReftestFissionParent extends JSWindowActorParent {
     let cwg = browsingContext.currentWindowGlobal;
     if (!cwg || !cwg.isProcessRoot) {
       if (cwg) {
-        errorStrings.push("tellChildrenToUpdateLayerTree called on a non process root?");
+        errorStrings.push(
+          "tellChildrenToUpdateLayerTree called on a non process root?"
+        );
       }
-      return {errorStrings, infoStrings};
+      return { errorStrings, infoStrings };
     }
 
     let actor = cwg.getActor("ReftestFission");
     if (!actor) {
-      return {errorStrings, infoStrings};
+      return { errorStrings, infoStrings };
     }
 
     // When we paint a document we also update the EffectsInfo visible rect in
@@ -77,22 +100,31 @@ class ReftestFissionParent extends JSWindowActorParent {
       let result = await actor.sendQuery("UpdateLayerTree");
       errorStrings.push(...result.errorStrings);
     } catch (e) {
-      infoStrings.push("tellChildrenToUpdateLayerTree UpdateLayerTree msg to child rejected: " + e);
+      infoStrings.push(
+        "tellChildrenToUpdateLayerTree UpdateLayerTree msg to child rejected: " +
+          e
+      );
     }
 
-    let descendants = actor.getNearestProcessRootProperDescendants(browsingContext);
+    let descendants =
+      actor.getNearestProcessRootProperDescendants(browsingContext);
     for (let context of descendants) {
       let cwg2 = context.currentWindowGlobal;
       if (cwg2) {
         if (!cwg2.isProcessRoot) {
-          errorStrings.push("getNearestProcessRootProperDescendants returned a non process root?");
+          errorStrings.push(
+            "getNearestProcessRootProperDescendants returned a non process root?"
+          );
         }
         let actor2 = cwg2.getActor("ReftestFission");
         if (actor2) {
           try {
             await actor2.sendQuery("EmptyMessage");
-          } catch(e) {
-            infoStrings.push("tellChildrenToUpdateLayerTree EmptyMessage msg to child rejected: " + e);
+          } catch (e) {
+            infoStrings.push(
+              "tellChildrenToUpdateLayerTree EmptyMessage msg to child rejected: " +
+                e
+            );
           }
 
           try {
@@ -100,14 +132,16 @@ class ReftestFissionParent extends JSWindowActorParent {
             errorStrings.push(...result2.errorStrings);
             infoStrings.push(...result2.infoStrings);
           } catch (e) {
-            errorStrings.push("tellChildrenToUpdateLayerTree recursive tellChildrenToUpdateLayerTree call rejected: " + e);
+            errorStrings.push(
+              "tellChildrenToUpdateLayerTree recursive tellChildrenToUpdateLayerTree call rejected: " +
+                e
+            );
           }
-
         }
       }
     }
 
-    return {errorStrings, infoStrings};
+    return { errorStrings, infoStrings };
   }
 
   tellChildrenToSetupDisplayport(browsingContext, promises) {
@@ -125,38 +159,52 @@ class ReftestFissionParent extends JSWindowActorParent {
     }
   }
 
-  tellChildrenToSetupAsyncScrollOffsets(browsingContext, allowFailure, promises) {
+  tellChildrenToSetupAsyncScrollOffsets(
+    browsingContext,
+    allowFailure,
+    promises
+  ) {
     let cwg = browsingContext.currentWindowGlobal;
     if (cwg && cwg.isProcessRoot) {
       let a = cwg.getActor("ReftestFission");
       if (a) {
-        let responsePromise = a.sendQuery("SetupAsyncScrollOffsets", {allowFailure});
+        let responsePromise = a.sendQuery("SetupAsyncScrollOffsets", {
+          allowFailure,
+        });
         promises.push(responsePromise);
       }
     }
 
     for (let context of browsingContext.children) {
-      this.tellChildrenToSetupAsyncScrollOffsets(context, allowFailure, promises);
+      this.tellChildrenToSetupAsyncScrollOffsets(
+        context,
+        allowFailure,
+        promises
+      );
     }
   }
 
-
   receiveMessage(msg) {
     switch (msg.name) {
-      case "ForwardAfterPaintEvent":
-      {
+      case "ForwardAfterPaintEvent": {
         let cwg = msg.data.toBrowsingContext.currentWindowGlobal;
         if (cwg) {
           let a = cwg.getActor("ReftestFission");
           if (a) {
-            a.sendAsyncMessage("ForwardAfterPaintEventToSelfAndParent", msg.data);
+            a.sendAsyncMessage(
+              "ForwardAfterPaintEventToSelfAndParent",
+              msg.data
+            );
           }
         }
         break;
       }
-      case "FlushRendering":
-      {
-        let promise = this.tellChildrenToFlushRendering(msg.data.browsingContext, msg.data.ignoreThrottledAnimations, msg.data.needsAnimationFrame);
+      case "FlushRendering": {
+        let promise = this.tellChildrenToFlushRendering(
+          msg.data.browsingContext,
+          msg.data.ignoreThrottledAnimations,
+          msg.data.needsAnimationFrame
+        );
         return promise.then(function (results) {
           let errorStrings = [];
           let warningStrings = [];
@@ -164,11 +212,16 @@ class ReftestFissionParent extends JSWindowActorParent {
           for (let r of results) {
             if (r.status != "fulfilled") {
               if (r.status == "pending") {
-                errorStrings.push("FlushRendering sendQuery to child promise still pending?");
+                errorStrings.push(
+                  "FlushRendering sendQuery to child promise still pending?"
+                );
               } else {
                 // We expect actors to go away causing sendQuery's to fail, so
                 // just note it.
-                infoStrings.push("FlushRendering sendQuery to child promise rejected: " + r.reason);
+                infoStrings.push(
+                  "FlushRendering sendQuery to child promise rejected: " +
+                    r.reason
+                );
               }
               continue;
             }
@@ -177,15 +230,13 @@ class ReftestFissionParent extends JSWindowActorParent {
             warningStrings.push(...r.value.warningStrings);
             infoStrings.push(...r.value.infoStrings);
           }
-          return {errorStrings, warningStrings, infoStrings};
+          return { errorStrings, warningStrings, infoStrings };
         });
       }
-      case "UpdateLayerTree":
-      {
+      case "UpdateLayerTree": {
         return this.tellChildrenToUpdateLayerTree(msg.data.browsingContext);
       }
-      case "TellChildrenToSetupDisplayport":
-      {
+      case "TellChildrenToSetupDisplayport": {
         let promises = [];
         this.tellChildrenToSetupDisplayport(msg.data.browsingContext, promises);
         return Promise.allSettled(promises).then(function (results) {
@@ -195,21 +246,27 @@ class ReftestFissionParent extends JSWindowActorParent {
             if (r.status != "fulfilled") {
               // We expect actors to go away causing sendQuery's to fail, so
               // just note it.
-              infoStrings.push("SetupDisplayport sendQuery to child promise rejected: " + r.reason);
+              infoStrings.push(
+                "SetupDisplayport sendQuery to child promise rejected: " +
+                  r.reason
+              );
               continue;
             }
 
             errorStrings.push(...r.value.errorStrings);
             infoStrings.push(...r.value.infoStrings);
           }
-          return {errorStrings, infoStrings}
+          return { errorStrings, infoStrings };
         });
       }
 
-      case "SetupAsyncScrollOffsets":
-      {
+      case "SetupAsyncScrollOffsets": {
         let promises = [];
-        this.tellChildrenToSetupAsyncScrollOffsets(this.manager.browsingContext, msg.data.allowFailure, promises);
+        this.tellChildrenToSetupAsyncScrollOffsets(
+          this.manager.browsingContext,
+          msg.data.allowFailure,
+          promises
+        );
         return Promise.allSettled(promises).then(function (results) {
           let errorStrings = [];
           let infoStrings = [];
@@ -218,7 +275,10 @@ class ReftestFissionParent extends JSWindowActorParent {
             if (r.status != "fulfilled") {
               // We expect actors to go away causing sendQuery's to fail, so
               // just note it.
-              infoStrings.push("SetupAsyncScrollOffsets sendQuery to child promise rejected: " + r.reason);
+              infoStrings.push(
+                "SetupAsyncScrollOffsets sendQuery to child promise rejected: " +
+                  r.reason
+              );
               continue;
             }
 
@@ -228,11 +288,9 @@ class ReftestFissionParent extends JSWindowActorParent {
               updatedAny = true;
             }
           }
-          return {errorStrings, infoStrings, updatedAny};
+          return { errorStrings, infoStrings, updatedAny };
         });
       }
-
     }
   }
-
 }
diff --git a/layout/tools/reftest/api.js b/layout/tools/reftest/api.js
index a0f20a77ad79..b6691cefd7ba 100644
--- a/layout/tools/reftest/api.js
+++ b/layout/tools/reftest/api.js
@@ -33,7 +33,7 @@ function processTerminated() {
 
 function startAndroid(win) {
   // Add setTimeout here because windows.innerWidth/Height are not set yet.
-  win.setTimeout(function() {
+  win.setTimeout(function () {
     OnRefTestLoad(win);
   }, 0);
 }
@@ -125,7 +125,7 @@ this.reftest = class extends ExtensionAPI {
       "chrome,dialog=no,left=800,height=200,width=200,all",
       null
     );
-    dummy.onload = async function() {
+    dummy.onload = async function () {
       // Close pre-existing window
       win.close();
 
diff --git a/layout/tools/reftest/globals.jsm b/layout/tools/reftest/globals.jsm
index 7f1486d5f5ba..b74a29e5b336 100644
--- a/layout/tools/reftest/globals.jsm
+++ b/layout/tools/reftest/globals.jsm
@@ -17,16 +17,16 @@ for (let [key, val] of Object.entries({
   NS_DIRECTORY_SERVICE_CONTRACTID: "@mozilla.org/file/directory_service;1",
   NS_OBSERVER_SERVICE_CONTRACTID: "@mozilla.org/observer-service;1",
 
-  TYPE_REFTEST_EQUAL: '==',
-  TYPE_REFTEST_NOTEQUAL: '!=',
-  TYPE_LOAD: 'load',     // test without a reference (just test that it does
-                         // not assert, crash, hang, or leak)
-  TYPE_SCRIPT: 'script', // test contains individual test results
-  TYPE_PRINT: 'print',   // test and reference will be printed to PDF's and
-                         // compared structurally
+  TYPE_REFTEST_EQUAL: "==",
+  TYPE_REFTEST_NOTEQUAL: "!=",
+  TYPE_LOAD: "load", // test without a reference (just test that it does
+  // not assert, crash, hang, or leak)
+  TYPE_SCRIPT: "script", // test contains individual test results
+  TYPE_PRINT: "print", // test and reference will be printed to PDF's and
+  // compared structurally
 
   // keep this in sync with reftest-content.js
-  URL_TARGET_TYPE_TEST: 0,      // first url
+  URL_TARGET_TYPE_TEST: 0, // first url
   URL_TARGET_TYPE_REFERENCE: 1, // second url, if any
 
   // The order of these constants matters, since when we have a status
@@ -50,7 +50,8 @@ for (let [key, val] of Object.entries({
   FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS: "non-needs-focus",
 
   // "<!--CLEAR-->"
-  BLANK_URL_FOR_CLEARING: "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E",
+  BLANK_URL_FOR_CLEARING:
+    "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E",
 
   /* Globals */
   g: {
@@ -73,11 +74,11 @@ for (let [key, val] of Object.entries({
 
     browser: undefined,
     // Are we testing web content loaded in a separate process?
-    browserIsRemote: undefined,        // bool
+    browserIsRemote: undefined, // bool
     // Are we using <iframe mozbrowser>?
-    browserIsIframe: undefined,        // bool
-    browserMessageManager: undefined,  // bool
-    useDrawSnapshot: undefined,        // bool
+    browserIsIframe: undefined, // bool
+    browserMessageManager: undefined, // bool
+    useDrawSnapshot: undefined, // bool
     canvas1: undefined,
     canvas2: undefined,
     // gCurrentCanvas is non-null between InitCurrentCanvasWithSnapshot and the next
@@ -100,9 +101,9 @@ for (let [key, val] of Object.entries({
       AssertionUnexpected: 0,
       AssertionUnexpectedFixed: 0,
       // Known problems...
-      KnownFail : 0,
+      KnownFail: 0,
       AssertionKnown: 0,
-      Random : 0,
+      Random: 0,
       Skip: 0,
       Slow: 0,
     },
@@ -159,7 +160,7 @@ for (let [key, val] of Object.entries({
     // Only dump the sandbox once, because it doesn't depend on the
     // manifest URL (yet!).
     dumpedConditionSandbox: false,
-  }
+  },
 })) {
   this[key] = val;
   EXPORTED_SYMBOLS.push(key);
diff --git a/layout/tools/reftest/manifest.jsm b/layout/tools/reftest/manifest.jsm
index 75bd4b9989ad..9b3fa1292e0c 100644
--- a/layout/tools/reftest/manifest.jsm
+++ b/layout/tools/reftest/manifest.jsm
@@ -6,794 +6,1006 @@
 var EXPORTED_SYMBOLS = ["ReadTopManifest", "CreateUrls"];
 
 const {
-    NS_GFXINFO_CONTRACTID,
+  NS_GFXINFO_CONTRACTID,
 
-    TYPE_REFTEST_EQUAL,
-    TYPE_REFTEST_NOTEQUAL,
-    TYPE_LOAD,
-    TYPE_SCRIPT,
-    TYPE_PRINT,
+  TYPE_REFTEST_EQUAL,
+  TYPE_REFTEST_NOTEQUAL,
+  TYPE_LOAD,
+  TYPE_SCRIPT,
+  TYPE_PRINT,
 
-    EXPECTED_PASS,
-    EXPECTED_FAIL,
-    EXPECTED_RANDOM,
-    EXPECTED_FUZZY,
+  EXPECTED_PASS,
+  EXPECTED_FAIL,
+  EXPECTED_RANDOM,
+  EXPECTED_FUZZY,
 
-    PREF_BOOLEAN,
-    PREF_STRING,
-    PREF_INTEGER,
+  PREF_BOOLEAN,
+  PREF_STRING,
+  PREF_INTEGER,
 
-    FOCUS_FILTER_NEEDS_FOCUS_TESTS,
-    FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS,
+  FOCUS_FILTER_NEEDS_FOCUS_TESTS,
+  FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS,
 
-    g,
+  g,
 } = ChromeUtils.import("resource://reftest/globals.jsm");
-const { NetUtil } = ChromeUtils.importESModule("resource://gre/modules/NetUtil.sys.mjs");
+const { NetUtil } = ChromeUtils.importESModule(
+  "resource://gre/modules/NetUtil.sys.mjs"
+);
 const { AppConstants } = ChromeUtils.importESModule(
-    "resource://gre/modules/AppConstants.sys.mjs"
+  "resource://gre/modules/AppConstants.sys.mjs"
 );
 
-const NS_SCRIPTSECURITYMANAGER_CONTRACTID = "@mozilla.org/scriptsecuritymanager;1";
-const NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX = "@mozilla.org/network/protocol;1?name=";
+const NS_SCRIPTSECURITYMANAGER_CONTRACTID =
+  "@mozilla.org/scriptsecuritymanager;1";
+const NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX =
+  "@mozilla.org/network/protocol;1?name=";
 const NS_XREAPPINFO_CONTRACTID = "@mozilla.org/xre/app-info;1";
 
 const RE_PROTOCOL = /^\w+:/;
 const RE_PREF_ITEM = /^(|test-|ref-)pref\((.+?),(.*)\)$/;
 
+function ReadTopManifest(aFileURL, aFilter, aManifestID) {
+  var url = g.ioService.newURI(aFileURL);
+  if (!url) throw "Expected a file or http URL for the manifest.";
 
-function ReadTopManifest(aFileURL, aFilter, aManifestID)
-{
-    var url = g.ioService.newURI(aFileURL);
-    if (!url)
-        throw "Expected a file or http URL for the manifest.";
-
-    g.manifestsLoaded = {};
-    ReadManifest(url, aFilter, aManifestID);
+  g.manifestsLoaded = {};
+  ReadManifest(url, aFilter, aManifestID);
 }
 
 // Note: If you materially change the reftest manifest parsing,
 // please keep the parser in layout/tools/reftest/__init__.py in sync.
-function ReadManifest(aURL, aFilter, aManifestID)
-{
-    // Ensure each manifest is only read once. This assumes that manifests that
-    // are included with filters will be read via their include before they are
-    // read directly in the case of a duplicate
-    if (g.manifestsLoaded.hasOwnProperty(aURL.spec)) {
-        if (g.manifestsLoaded[aURL.spec] === null)
-            return;
-        else
-            aFilter = [aFilter[0], aFilter[1], true];
-    }
-    g.manifestsLoaded[aURL.spec] = aFilter[1];
+function ReadManifest(aURL, aFilter, aManifestID) {
+  // Ensure each manifest is only read once. This assumes that manifests that
+  // are included with filters will be read via their include before they are
+  // read directly in the case of a duplicate
+  if (g.manifestsLoaded.hasOwnProperty(aURL.spec)) {
+    if (g.manifestsLoaded[aURL.spec] === null) return;
+    else aFilter = [aFilter[0], aFilter[1], true];
+  }
+  g.manifestsLoaded[aURL.spec] = aFilter[1];
 
-    var secMan = Cc[NS_SCRIPTSECURITYMANAGER_CONTRACTID]
-                     .getService(Ci.nsIScriptSecurityManager);
+  var secMan = Cc[NS_SCRIPTSECURITYMANAGER_CONTRACTID].getService(
+    Ci.nsIScriptSecurityManager
+  );
 
-    var listURL = aURL;
-    var channel = NetUtil.newChannel({uri: aURL,
-                                      loadUsingSystemPrincipal: true});
-    try {
-        var inputStream = channel.open();
-    } catch (e) {
-        g.logger.error("failed to open manifest at : " + aURL.spec);
-        throw e;
-    }
-    if (channel instanceof Ci.nsIHttpChannel
-        && channel.responseStatus != 200) {
-      g.logger.error("HTTP ERROR : " + channel.responseStatus);
-    }
-    var streamBuf = getStreamContent(inputStream);
-    inputStream.close();
-    var lines = streamBuf.split(/\n|\r|\r\n/);
+  var listURL = aURL;
+  var channel = NetUtil.newChannel({
+    uri: aURL,
+    loadUsingSystemPrincipal: true,
+  });
+  try {
+    var inputStream = channel.open();
+  } catch (e) {
+    g.logger.error("failed to open manifest at : " + aURL.spec);
+    throw e;
+  }
+  if (channel instanceof Ci.nsIHttpChannel && channel.responseStatus != 200) {
+    g.logger.error("HTTP ERROR : " + channel.responseStatus);
+  }
+  var streamBuf = getStreamContent(inputStream);
+  inputStream.close();
+  var lines = streamBuf.split(/\n|\r|\r\n/);
 
-    // The sandbox for fails-if(), etc., condition evaluation. This is not
-    // always required and so is created on demand.
-    var sandbox;
-    function GetOrCreateSandbox() {
-        if (!sandbox) {
-            sandbox = BuildConditionSandbox(aURL);
-        }
-        return sandbox;
+  // The sandbox for fails-if(), etc., condition evaluation. This is not
+  // always required and so is created on demand.
+  var sandbox;
+  function GetOrCreateSandbox() {
+    if (!sandbox) {
+      sandbox = BuildConditionSandbox(aURL);
+    }
+    return sandbox;
+  }
+
+  var lineNo = 0;
+  var urlprefix = "";
+  var defaults = [];
+  var defaultTestPrefSettings = [],
+    defaultRefPrefSettings = [];
+  if (g.compareRetainedDisplayLists) {
+    AddRetainedDisplayListTestPrefs(
+      GetOrCreateSandbox(),
+      defaultTestPrefSettings,
+      defaultRefPrefSettings
+    );
+  }
+  for (var str of lines) {
+    ++lineNo;
+    if (str.charAt(0) == "#") continue; // entire line was a comment
+    var i = str.search(/\s+#/);
+    if (i >= 0) str = str.substring(0, i);
+    // strip leading and trailing whitespace
+    str = str.replace(/^\s*/, "").replace(/\s*$/, "");
+    if (!str || str == "") continue;
+    var items = str.split(/\s+/); // split on whitespace
+
+    if (items[0] == "url-prefix") {
+      if (items.length != 2)
+        throw (
+          "url-prefix requires one url in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo
+        );
+      urlprefix = items[1];
+      continue;
     }
 
-    var lineNo = 0;
-    var urlprefix = "";
-    var defaults = [];
-    var defaultTestPrefSettings = [], defaultRefPrefSettings = [];
-    if (g.compareRetainedDisplayLists) {
-        AddRetainedDisplayListTestPrefs(GetOrCreateSandbox(), defaultTestPrefSettings,
-                                        defaultRefPrefSettings);
+    if (items[0] == "defaults") {
+      items.shift();
+      defaults = items;
+      continue;
     }
-    for (var str of lines) {
-        ++lineNo;
-        if (str.charAt(0) == "#")
-            continue; // entire line was a comment
-        var i = str.search(/\s+#/);
-        if (i >= 0)
-            str = str.substring(0, i);
-        // strip leading and trailing whitespace
-        str = str.replace(/^\s*/, '').replace(/\s*$/, '');
-        if (!str || str == "")
-            continue;
-        var items = str.split(/\s+/); // split on whitespace
 
-        if (items[0] == "url-prefix") {
-            if (items.length != 2)
-                throw "url-prefix requires one url in manifest file " + aURL.spec + " line " + lineNo;
-            urlprefix = items[1];
-            continue;
+    var expected_status = EXPECTED_PASS;
+    var allow_silent_fail = false;
+    var minAsserts = 0;
+    var maxAsserts = 0;
+    var needs_focus = false;
+    var slow = false;
+    var skip = false;
+    var testPrefSettings = defaultTestPrefSettings.concat();
+    var refPrefSettings = defaultRefPrefSettings.concat();
+    var fuzzy_delta = { min: 0, max: 2 };
+    var fuzzy_pixels = { min: 0, max: 1 };
+    var chaosMode = false;
+    var wrCapture = { test: false, ref: false };
+    var nonSkipUsed = false;
+    var noAutoFuzz = false;
+
+    var origLength = items.length;
+    items = defaults.concat(items);
+    while (
+      items[0].match(
+        /^(fails|needs-focus|random|skip|asserts|slow|require-or|silentfail|pref|test-pref|ref-pref|fuzzy|chaos-mode|wr-capture|wr-capture-ref|noautofuzz)/
+      )
+    ) {
+      var item = items.shift();
+      var stat;
+      var cond;
+      var m = item.match(/^(fails|random|skip|silentfail)-if(\(.*\))$/);
+      if (m) {
+        stat = m[1];
+        // Note: m[2] contains the parentheses, and we want them.
+        cond = Cu.evalInSandbox(m[2], GetOrCreateSandbox());
+      } else if (item.match(/^(fails|random|skip)$/)) {
+        stat = item;
+        cond = true;
+      } else if (item == "needs-focus") {
+        needs_focus = true;
+        cond = false;
+      } else if ((m = item.match(/^asserts\((\d+)(-\d+)?\)$/))) {
+        cond = false;
+        minAsserts = Number(m[1]);
+        maxAsserts = m[2] == undefined ? minAsserts : Number(m[2].substring(1));
+      } else if ((m = item.match(/^asserts-if\((.*?),(\d+)(-\d+)?\)$/))) {
+        cond = false;
+        if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox())) {
+          minAsserts = Number(m[2]);
+          maxAsserts =
+            m[3] == undefined ? minAsserts : Number(m[3].substring(1));
+        }
+      } else if (item == "slow") {
+        cond = false;
+        slow = true;
+      } else if ((m = item.match(/^require-or\((.*?)\)$/))) {
+        var args = m[1].split(/,/);
+        if (args.length != 2) {
+          throw (
+            "Error in manifest file " +
+            aURL.spec +
+            " line " +
+            lineNo +
+            ": wrong number of args to require-or"
+          );
+        }
+        var [precondition_str, fallback_action] = args;
+        var preconditions = precondition_str.split(/&&/);
+        cond = false;
+        for (var precondition of preconditions) {
+          if (precondition === "debugMode") {
+            // Currently unimplemented. Requires asynchronous
+            // JSD call + getting an event while no JS is running
+            stat = fallback_action;
+            cond = true;
+            break;
+          } else if (precondition === "true") {
+            // For testing
+          } else {
+            // Unknown precondition. Assume it is unimplemented.
+            stat = fallback_action;
+            cond = true;
+            break;
+          }
+        }
+      } else if ((m = item.match(/^slow-if\((.*?)\)$/))) {
+        cond = false;
+        if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox()))
+          slow = true;
+      } else if (item == "silentfail") {
+        cond = false;
+        allow_silent_fail = true;
+      } else if ((m = item.match(RE_PREF_ITEM))) {
+        cond = false;
+        if (
+          !AddPrefSettings(
+            m[1],
+            m[2],
+            m[3],
+            GetOrCreateSandbox(),
+            testPrefSettings,
+            refPrefSettings
+          )
+        ) {
+          throw (
+            "Error in pref value in manifest file " +
+            aURL.spec +
+            " line " +
+            lineNo
+          );
+        }
+      } else if ((m = item.match(/^fuzzy\((\d+)-(\d+),(\d+)-(\d+)\)$/))) {
+        cond = false;
+        expected_status = EXPECTED_FUZZY;
+        fuzzy_delta = ExtractRange(m, 1);
+        fuzzy_pixels = ExtractRange(m, 3);
+      } else if (
+        (m = item.match(/^fuzzy-if\((.*?),(\d+)-(\d+),(\d+)-(\d+)\)$/))
+      ) {
+        cond = false;
+        if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox())) {
+          expected_status = EXPECTED_FUZZY;
+          fuzzy_delta = ExtractRange(m, 2);
+          fuzzy_pixels = ExtractRange(m, 4);
+        }
+      } else if (item == "chaos-mode") {
+        cond = false;
+        chaosMode = true;
+      } else if (item == "wr-capture") {
+        cond = false;
+        wrCapture.test = true;
+      } else if (item == "wr-capture-ref") {
+        cond = false;
+        wrCapture.ref = true;
+      } else if (item == "noautofuzz") {
+        cond = false;
+        noAutoFuzz = true;
+      } else {
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": unexpected item " +
+          item
+        );
+      }
+
+      if (stat != "skip") {
+        nonSkipUsed = true;
+      }
+
+      if (cond) {
+        if (stat == "fails") {
+          expected_status = EXPECTED_FAIL;
+        } else if (stat == "random") {
+          expected_status = EXPECTED_RANDOM;
+        } else if (stat == "skip") {
+          skip = true;
+        } else if (stat == "silentfail") {
+          allow_silent_fail = true;
+        }
+      }
+    }
+
+    if (items.length > origLength) {
+      // Implies we broke out of the loop before we finished processing
+      // defaults. This means defaults contained an invalid token.
+      throw (
+        "Error in manifest file " +
+        aURL.spec +
+        " line " +
+        lineNo +
+        ": invalid defaults token '" +
+        items[0] +
+        "'"
+      );
+    }
+
+    if (minAsserts > maxAsserts) {
+      throw "Bad range in manifest file " + aURL.spec + " line " + lineNo;
+    }
+
+    var runHttp = false;
+    var httpDepth;
+    if (items[0] == "HTTP") {
+      runHttp = aURL.scheme == "file"; // We can't yet run the local HTTP server
+      // for non-local reftests.
+      httpDepth = 0;
+      items.shift();
+    } else if (items[0].match(/HTTP\(\.\.(\/\.\.)*\)/)) {
+      // Accept HTTP(..), HTTP(../..), HTTP(../../..), etc.
+      runHttp = aURL.scheme == "file"; // We can't yet run the local HTTP server
+      // for non-local reftests.
+      httpDepth = (items[0].length - 5) / 3;
+      items.shift();
+    }
+
+    // do not prefix the url for include commands or urls specifying
+    // a protocol
+    if (urlprefix && items[0] != "include") {
+      if (items.length > 1 && !items[1].match(RE_PROTOCOL)) {
+        items[1] = urlprefix + items[1];
+      }
+      if (items.length > 2 && !items[2].match(RE_PROTOCOL)) {
+        items[2] = urlprefix + items[2];
+      }
+    }
+
+    var principal = secMan.createContentPrincipal(aURL, {});
+
+    if (items[0] == "include") {
+      if (items.length != 2)
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": incorrect number of arguments to include"
+        );
+      if (runHttp)
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": use of include with http"
+        );
+
+      // If the expected_status is EXPECTED_PASS (the default) then allow
+      // the include. If 'skip' is true, that means there was a skip
+      // or skip-if annotation (with a true condition) on this include
+      // statement, so we should skip the include. Any other expected_status
+      // is disallowed since it's nonintuitive as to what the intended
+      // effect is.
+      if (nonSkipUsed) {
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": include statement with annotation other than 'skip' or 'skip-if'"
+        );
+      } else if (skip) {
+        g.logger.info(
+          "Skipping included manifest at " +
+            aURL.spec +
+            " line " +
+            lineNo +
+            " due to matching skip condition"
+        );
+      } else {
+        // poor man's assertion
+        if (expected_status != EXPECTED_PASS) {
+          throw (
+            "Error in manifest file parsing code: we should never get expected_status=" +
+            expected_status +
+            " when nonSkipUsed=false (from " +
+            aURL.spec +
+            " line " +
+            lineNo +
+            ")"
+          );
         }
 
-        if (items[0] == "defaults") {
-            items.shift();
-            defaults = items;
-            continue;
-        }
+        var incURI = g.ioService.newURI(items[1], null, listURL);
+        secMan.checkLoadURIWithPrincipal(
+          principal,
+          incURI,
+          Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT
+        );
 
-        var expected_status = EXPECTED_PASS;
-        var allow_silent_fail = false;
-        var minAsserts = 0;
-        var maxAsserts = 0;
-        var needs_focus = false;
-        var slow = false;
-        var skip = false;
-        var testPrefSettings = defaultTestPrefSettings.concat();
-        var refPrefSettings = defaultRefPrefSettings.concat();
-        var fuzzy_delta = { min: 0, max: 2 };
-        var fuzzy_pixels = { min: 0, max: 1 };
-        var chaosMode = false;
-        var wrCapture = { test: false, ref: false };
-        var nonSkipUsed = false;
-        var noAutoFuzz = false;
-
-        var origLength = items.length;
-        items = defaults.concat(items);
-        while (items[0].match(/^(fails|needs-focus|random|skip|asserts|slow|require-or|silentfail|pref|test-pref|ref-pref|fuzzy|chaos-mode|wr-capture|wr-capture-ref|noautofuzz)/)) {
-            var item = items.shift();
-            var stat;
-            var cond;
-            var m = item.match(/^(fails|random|skip|silentfail)-if(\(.*\))$/);
-            if (m) {
-                stat = m[1];
-                // Note: m[2] contains the parentheses, and we want them.
-                cond = Cu.evalInSandbox(m[2], GetOrCreateSandbox());
-            } else if (item.match(/^(fails|random|skip)$/)) {
-                stat = item;
-                cond = true;
-            } else if (item == "needs-focus") {
-                needs_focus = true;
-                cond = false;
-            } else if ((m = item.match(/^asserts\((\d+)(-\d+)?\)$/))) {
-                cond = false;
-                minAsserts = Number(m[1]);
-                maxAsserts = (m[2] == undefined) ? minAsserts
-                                                 : Number(m[2].substring(1));
-            } else if ((m = item.match(/^asserts-if\((.*?),(\d+)(-\d+)?\)$/))) {
-                cond = false;
-                if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox())) {
-                    minAsserts = Number(m[2]);
-                    maxAsserts =
-                      (m[3] == undefined) ? minAsserts
-                                          : Number(m[3].substring(1));
-                }
-            } else if (item == "slow") {
-                cond = false;
-                slow = true;
-            } else if ((m = item.match(/^require-or\((.*?)\)$/))) {
-                var args = m[1].split(/,/);
-                if (args.length != 2) {
-                    throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": wrong number of args to require-or";
-                }
-                var [precondition_str, fallback_action] = args;
-                var preconditions = precondition_str.split(/&&/);
-                cond = false;
-                for (var precondition of preconditions) {
-                    if (precondition === "debugMode") {
-                        // Currently unimplemented. Requires asynchronous
-                        // JSD call + getting an event while no JS is running
-                        stat = fallback_action;
-                        cond = true;
-                        break;
-                    } else if (precondition === "true") {
-                        // For testing
-                    } else {
-                        // Unknown precondition. Assume it is unimplemented.
-                        stat = fallback_action;
-                        cond = true;
-                        break;
-                    }
-                }
-            } else if ((m = item.match(/^slow-if\((.*?)\)$/))) {
-                cond = false;
-                if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox()))
-                    slow = true;
-            } else if (item == "silentfail") {
-                cond = false;
-                allow_silent_fail = true;
-            } else if ((m = item.match(RE_PREF_ITEM))) {
-                cond = false;
-                if (!AddPrefSettings(m[1], m[2], m[3], GetOrCreateSandbox(),
-                                     testPrefSettings, refPrefSettings)) {
-                    throw "Error in pref value in manifest file " + aURL.spec + " line " + lineNo;
-                }
-            } else if ((m = item.match(/^fuzzy\((\d+)-(\d+),(\d+)-(\d+)\)$/))) {
-              cond = false;
-              expected_status = EXPECTED_FUZZY;
-              fuzzy_delta = ExtractRange(m, 1);
-              fuzzy_pixels = ExtractRange(m, 3);
-            } else if ((m = item.match(/^fuzzy-if\((.*?),(\d+)-(\d+),(\d+)-(\d+)\)$/))) {
-              cond = false;
-              if (Cu.evalInSandbox("(" + m[1] + ")", GetOrCreateSandbox())) {
-                expected_status = EXPECTED_FUZZY;
-                fuzzy_delta = ExtractRange(m, 2);
-                fuzzy_pixels = ExtractRange(m, 4);
-              }
-            } else if (item == "chaos-mode") {
-                cond = false;
-                chaosMode = true;
-            } else if (item == "wr-capture") {
-                cond = false;
-                wrCapture.test = true;
-            } else if (item == "wr-capture-ref") {
-                cond = false;
-                wrCapture.ref = true;
-            } else if (item == "noautofuzz") {
-                cond = false;
-                noAutoFuzz = true;
-            } else {
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": unexpected item " + item;
-            }
-
-            if (stat != "skip") {
-                nonSkipUsed = true;
-            }
-
-            if (cond) {
-                if (stat == "fails") {
-                    expected_status = EXPECTED_FAIL;
-                } else if (stat == "random") {
-                    expected_status = EXPECTED_RANDOM;
-                } else if (stat == "skip") {
-                    skip = true;
-                } else if (stat == "silentfail") {
-                    allow_silent_fail = true;
-                }
-            }
-        }
-
-        if (items.length > origLength) {
-            // Implies we broke out of the loop before we finished processing
-            // defaults. This means defaults contained an invalid token.
-            throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": invalid defaults token '" + items[0] + "'";
-        }
-
-        if (minAsserts > maxAsserts) {
-            throw "Bad range in manifest file " + aURL.spec + " line " + lineNo;
-        }
-
-        var runHttp = false;
-        var httpDepth;
-        if (items[0] == "HTTP") {
-            runHttp = (aURL.scheme == "file"); // We can't yet run the local HTTP server
-                                               // for non-local reftests.
-            httpDepth = 0;
-            items.shift();
-        } else if (items[0].match(/HTTP\(\.\.(\/\.\.)*\)/)) {
-            // Accept HTTP(..), HTTP(../..), HTTP(../../..), etc.
-            runHttp = (aURL.scheme == "file"); // We can't yet run the local HTTP server
-                                               // for non-local reftests.
-            httpDepth = (items[0].length - 5) / 3;
-            items.shift();
-        }
-
-        // do not prefix the url for include commands or urls specifying
-        // a protocol
-        if (urlprefix && items[0] != "include") {
-            if (items.length > 1 && !items[1].match(RE_PROTOCOL)) {
-                items[1] = urlprefix + items[1];
-            }
-            if (items.length > 2 && !items[2].match(RE_PROTOCOL)) {
-                items[2] = urlprefix + items[2];
-            }
-        }
-
-        var principal = secMan.createContentPrincipal(aURL, {});
-
-        if (items[0] == "include") {
-            if (items.length != 2)
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": incorrect number of arguments to include";
-            if (runHttp)
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": use of include with http";
-
-            // If the expected_status is EXPECTED_PASS (the default) then allow
-            // the include. If 'skip' is true, that means there was a skip
-            // or skip-if annotation (with a true condition) on this include
-            // statement, so we should skip the include. Any other expected_status
-            // is disallowed since it's nonintuitive as to what the intended
-            // effect is.
-            if (nonSkipUsed) {
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": include statement with annotation other than 'skip' or 'skip-if'";
-            } else if (skip) {
-                g.logger.info("Skipping included manifest at " + aURL.spec + " line " + lineNo + " due to matching skip condition");
-            } else {
-                // poor man's assertion
-                if (expected_status != EXPECTED_PASS) {
-                    throw "Error in manifest file parsing code: we should never get expected_status=" + expected_status + " when nonSkipUsed=false (from " + aURL.spec + " line " + lineNo + ")";
-                }
-
-                var incURI = g.ioService.newURI(items[1], null, listURL);
-                secMan.checkLoadURIWithPrincipal(principal, incURI,
-                                                 Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
-
-                // Cannot use nsIFile or similar to manipulate the manifest ID; although it appears
-                // path-like, it does not refer to an actual path in the filesystem.
-                var newManifestID = aManifestID;
-                var included = items[1];
-                // Remove included manifest file name.
-                // eg. dir1/dir2/reftest.list -> dir1/dir2
-                var pos = included.lastIndexOf("/");
-                if (pos <= 0) {
-                    included = "";
-                } else {
-                    included = included.substring(0, pos);
-                }
-                // Simplify references to parent directories.
-                // eg. dir1/dir2/../dir3 -> dir1/dir3
-                while (included.startsWith("../")) {
-                    pos = newManifestID.lastIndexOf("/");
-                    if (pos < 0) {
-                        pos = 0;
-                    }
-                    newManifestID = newManifestID.substring(0, pos);
-                    included = included.substring(3);
-                }
-                // Use a new manifest ID if the included manifest is in a different directory.
-                if (included.length > 0) {
-                    if (newManifestID.length > 0) {
-                        newManifestID = newManifestID + "/" + included;
-                    } else {
-                        // parent directory includes may refer to the topsrcdir
-                        newManifestID = included;
-                    }
-                }
-                ReadManifest(incURI, aFilter, newManifestID);
-            }
-        } else if (items[0] == TYPE_LOAD || items[0] == TYPE_SCRIPT) {
-            var type = items[0];
-            if (items.length != 2)
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": incorrect number of arguments to " + type;
-            if (type == TYPE_LOAD && expected_status != EXPECTED_PASS)
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": incorrect known failure type for load test";
-            AddTestItem({ type: type,
-                          expected: expected_status,
-                          manifest: aURL.spec,
-                          manifestID: TestIdentifier(aURL.spec, aManifestID),
-                          allowSilentFail: allow_silent_fail,
-                          minAsserts: minAsserts,
-                          maxAsserts: maxAsserts,
-                          needsFocus: needs_focus,
-                          slow: slow,
-                          skip: skip,
-                          prefSettings1: testPrefSettings,
-                          prefSettings2: refPrefSettings,
-                          fuzzyMinDelta: fuzzy_delta.min,
-                          fuzzyMaxDelta: fuzzy_delta.max,
-                          fuzzyMinPixels: fuzzy_pixels.min,
-                          fuzzyMaxPixels: fuzzy_pixels.max,
-                          runHttp: runHttp,
-                          httpDepth: httpDepth,
-                          url1: items[1],
-                          url2: null,
-                          chaosMode: chaosMode,
-                          wrCapture: wrCapture,
-                          noAutoFuzz: noAutoFuzz }, aFilter, aManifestID);
-        } else if (items[0] == TYPE_REFTEST_EQUAL || items[0] == TYPE_REFTEST_NOTEQUAL || items[0] == TYPE_PRINT) {
-            if (items.length != 3)
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": incorrect number of arguments to " + items[0];
-
-            if (items[0] == TYPE_REFTEST_NOTEQUAL &&
-                expected_status == EXPECTED_FUZZY &&
-                (fuzzy_delta.min > 0 || fuzzy_pixels.min > 0)) {
-                throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": minimum fuzz must be zero for tests of type " + items[0];
-            }
-
-            var type = items[0];
-            if (g.compareRetainedDisplayLists) {
-                type = TYPE_REFTEST_EQUAL;
-
-                // We expect twice as many assertion failures when comparing
-                // tests because we run each test twice.
-                minAsserts *= 2;
-                maxAsserts *= 2;
-
-                // Skip the test if it is expected to fail in both modes.
-                // It would unexpectedly "pass" in comparison mode mode when
-                // comparing the two failures, which is not a useful result.
-                if (expected_status === EXPECTED_FAIL ||
-                    expected_status === EXPECTED_RANDOM) {
-                    skip = true;
-                }
-            }
-
-            AddTestItem({ type: type,
-                          expected: expected_status,
-                          manifest: aURL.spec,
-                          manifestID: TestIdentifier(aURL.spec, aManifestID),
-                          allowSilentFail: allow_silent_fail,
-                          minAsserts: minAsserts,
-                          maxAsserts: maxAsserts,
-                          needsFocus: needs_focus,
-                          slow: slow,
-                          skip: skip,
-                          prefSettings1: testPrefSettings,
-                          prefSettings2: refPrefSettings,
-                          fuzzyMinDelta: fuzzy_delta.min,
-                          fuzzyMaxDelta: fuzzy_delta.max,
-                          fuzzyMinPixels: fuzzy_pixels.min,
-                          fuzzyMaxPixels: fuzzy_pixels.max,
-                          runHttp: runHttp,
-                          httpDepth: httpDepth,
-                          url1: items[1],
-                          url2: items[2],
-                          chaosMode: chaosMode,
-                          wrCapture: wrCapture,
-                          noAutoFuzz: noAutoFuzz }, aFilter, aManifestID);
+        // Cannot use nsIFile or similar to manipulate the manifest ID; although it appears
+        // path-like, it does not refer to an actual path in the filesystem.
+        var newManifestID = aManifestID;
+        var included = items[1];
+        // Remove included manifest file name.
+        // eg. dir1/dir2/reftest.list -> dir1/dir2
+        var pos = included.lastIndexOf("/");
+        if (pos <= 0) {
+          included = "";
         } else {
-            throw "Error in manifest file " + aURL.spec + " line " + lineNo + ": unknown test type " + items[0];
+          included = included.substring(0, pos);
         }
+        // Simplify references to parent directories.
+        // eg. dir1/dir2/../dir3 -> dir1/dir3
+        while (included.startsWith("../")) {
+          pos = newManifestID.lastIndexOf("/");
+          if (pos < 0) {
+            pos = 0;
+          }
+          newManifestID = newManifestID.substring(0, pos);
+          included = included.substring(3);
+        }
+        // Use a new manifest ID if the included manifest is in a different directory.
+        if (included.length > 0) {
+          if (newManifestID.length > 0) {
+            newManifestID = newManifestID + "/" + included;
+          } else {
+            // parent directory includes may refer to the topsrcdir
+            newManifestID = included;
+          }
+        }
+        ReadManifest(incURI, aFilter, newManifestID);
+      }
+    } else if (items[0] == TYPE_LOAD || items[0] == TYPE_SCRIPT) {
+      var type = items[0];
+      if (items.length != 2)
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": incorrect number of arguments to " +
+          type
+        );
+      if (type == TYPE_LOAD && expected_status != EXPECTED_PASS)
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": incorrect known failure type for load test"
+        );
+      AddTestItem(
+        {
+          type: type,
+          expected: expected_status,
+          manifest: aURL.spec,
+          manifestID: TestIdentifier(aURL.spec, aManifestID),
+          allowSilentFail: allow_silent_fail,
+          minAsserts: minAsserts,
+          maxAsserts: maxAsserts,
+          needsFocus: needs_focus,
+          slow: slow,
+          skip: skip,
+          prefSettings1: testPrefSettings,
+          prefSettings2: refPrefSettings,
+          fuzzyMinDelta: fuzzy_delta.min,
+          fuzzyMaxDelta: fuzzy_delta.max,
+          fuzzyMinPixels: fuzzy_pixels.min,
+          fuzzyMaxPixels: fuzzy_pixels.max,
+          runHttp: runHttp,
+          httpDepth: httpDepth,
+          url1: items[1],
+          url2: null,
+          chaosMode: chaosMode,
+          wrCapture: wrCapture,
+          noAutoFuzz: noAutoFuzz,
+        },
+        aFilter,
+        aManifestID
+      );
+    } else if (
+      items[0] == TYPE_REFTEST_EQUAL ||
+      items[0] == TYPE_REFTEST_NOTEQUAL ||
+      items[0] == TYPE_PRINT
+    ) {
+      if (items.length != 3)
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": incorrect number of arguments to " +
+          items[0]
+        );
+
+      if (
+        items[0] == TYPE_REFTEST_NOTEQUAL &&
+        expected_status == EXPECTED_FUZZY &&
+        (fuzzy_delta.min > 0 || fuzzy_pixels.min > 0)
+      ) {
+        throw (
+          "Error in manifest file " +
+          aURL.spec +
+          " line " +
+          lineNo +
+          ": minimum fuzz must be zero for tests of type " +
+          items[0]
+        );
+      }
+
+      var type = items[0];
+      if (g.compareRetainedDisplayLists) {
+        type = TYPE_REFTEST_EQUAL;
+
+        // We expect twice as many assertion failures when comparing
+        // tests because we run each test twice.
+        minAsserts *= 2;
+        maxAsserts *= 2;
+
+        // Skip the test if it is expected to fail in both modes.
+        // It would unexpectedly "pass" in comparison mode mode when
+        // comparing the two failures, which is not a useful result.
+        if (
+          expected_status === EXPECTED_FAIL ||
+          expected_status === EXPECTED_RANDOM
+        ) {
+          skip = true;
+        }
+      }
+
+      AddTestItem(
+        {
+          type: type,
+          expected: expected_status,
+          manifest: aURL.spec,
+          manifestID: TestIdentifier(aURL.spec, aManifestID),
+          allowSilentFail: allow_silent_fail,
+          minAsserts: minAsserts,
+          maxAsserts: maxAsserts,
+          needsFocus: needs_focus,
+          slow: slow,
+          skip: skip,
+          prefSettings1: testPrefSettings,
+          prefSettings2: refPrefSettings,
+          fuzzyMinDelta: fuzzy_delta.min,
+          fuzzyMaxDelta: fuzzy_delta.max,
+          fuzzyMinPixels: fuzzy_pixels.min,
+          fuzzyMaxPixels: fuzzy_pixels.max,
+          runHttp: runHttp,
+          httpDepth: httpDepth,
+          url1: items[1],
+          url2: items[2],
+          chaosMode: chaosMode,
+          wrCapture: wrCapture,
+          noAutoFuzz: noAutoFuzz,
+        },
+        aFilter,
+        aManifestID
+      );
+    } else {
+      throw (
+        "Error in manifest file " +
+        aURL.spec +
+        " line " +
+        lineNo +
+        ": unknown test type " +
+        items[0]
+      );
     }
+  }
 }
 
 // Read all available data from an input stream and return it
 // as a string.
-function getStreamContent(inputStream)
-{
-    var streamBuf = "";
-    var sis = Cc["@mozilla.org/scriptableinputstream;1"].
-                  createInstance(Ci.nsIScriptableInputStream);
-    sis.init(inputStream);
+function getStreamContent(inputStream) {
+  var streamBuf = "";
+  var sis = Cc["@mozilla.org/scriptableinputstream;1"].createInstance(
+    Ci.nsIScriptableInputStream
+  );
+  sis.init(inputStream);
 
-    var available;
-    while ((available = sis.available()) != 0) {
-        streamBuf += sis.read(available);
-    }
+  var available;
+  while ((available = sis.available()) != 0) {
+    streamBuf += sis.read(available);
+  }
 
-    return streamBuf;
+  return streamBuf;
 }
 
 // Build the sandbox for fails-if(), etc., condition evaluation.
 function BuildConditionSandbox(aURL) {
-    var sandbox = new Cu.Sandbox(aURL.spec);
-    var xr = Cc[NS_XREAPPINFO_CONTRACTID].getService(Ci.nsIXULRuntime);
-    var appInfo = Cc[NS_XREAPPINFO_CONTRACTID].getService(Ci.nsIXULAppInfo);
-    sandbox.isDebugBuild = g.debug.isDebugBuild;
-    sandbox.isCoverageBuild = g.isCoverageBuild;
-    var prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefBranch);
+  var sandbox = new Cu.Sandbox(aURL.spec);
+  var xr = Cc[NS_XREAPPINFO_CONTRACTID].getService(Ci.nsIXULRuntime);
+  var appInfo = Cc[NS_XREAPPINFO_CONTRACTID].getService(Ci.nsIXULAppInfo);
+  sandbox.isDebugBuild = g.debug.isDebugBuild;
+  sandbox.isCoverageBuild = g.isCoverageBuild;
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+    Ci.nsIPrefBranch
+  );
 
-    sandbox.xulRuntime = Cu.cloneInto({widgetToolkit: xr.widgetToolkit, OS: xr.OS, XPCOMABI: xr.XPCOMABI}, sandbox);
+  sandbox.xulRuntime = Cu.cloneInto(
+    { widgetToolkit: xr.widgetToolkit, OS: xr.OS, XPCOMABI: xr.XPCOMABI },
+    sandbox
+  );
 
-    var testRect = g.browser.getBoundingClientRect();
-    sandbox.smallScreen = false;
-    if (g.containingWindow.innerWidth < 800 || g.containingWindow.innerHeight < 1000) {
-        sandbox.smallScreen = true;
+  var testRect = g.browser.getBoundingClientRect();
+  sandbox.smallScreen = false;
+  if (
+    g.containingWindow.innerWidth < 800 ||
+    g.containingWindow.innerHeight < 1000
+  ) {
+    sandbox.smallScreen = true;
+  }
+
+  var gfxInfo =
+    NS_GFXINFO_CONTRACTID in Cc &&
+    Cc[NS_GFXINFO_CONTRACTID].getService(Ci.nsIGfxInfo);
+  let readGfxInfo = function (obj, key) {
+    if (g.contentGfxInfo && key in g.contentGfxInfo) {
+      return g.contentGfxInfo[key];
     }
+    return obj[key];
+  };
 
-    var gfxInfo = (NS_GFXINFO_CONTRACTID in Cc) && Cc[NS_GFXINFO_CONTRACTID].getService(Ci.nsIGfxInfo);
-    let readGfxInfo = function (obj, key) {
-      if (g.contentGfxInfo && (key in g.contentGfxInfo)) {
-        return g.contentGfxInfo[key];
-      }
-      return obj[key];
+  try {
+    sandbox.d2d = readGfxInfo(gfxInfo, "D2DEnabled");
+    sandbox.dwrite = readGfxInfo(gfxInfo, "DWriteEnabled");
+    sandbox.embeddedInFirefoxReality = readGfxInfo(
+      gfxInfo,
+      "EmbeddedInFirefoxReality"
+    );
+  } catch (e) {
+    sandbox.d2d = false;
+    sandbox.dwrite = false;
+    sandbox.embeddedInFirefoxReality = false;
+  }
+
+  var canvasBackend = readGfxInfo(gfxInfo, "AzureCanvasBackend");
+  var contentBackend = readGfxInfo(gfxInfo, "AzureContentBackend");
+
+  sandbox.gpuProcess = gfxInfo.usingGPUProcess;
+  sandbox.azureCairo = canvasBackend == "cairo";
+  sandbox.azureSkia = canvasBackend == "skia";
+  sandbox.skiaContent = contentBackend == "skia";
+  sandbox.azureSkiaGL = false;
+  // true if we are using the same Azure backend for rendering canvas and content
+  sandbox.contentSameGfxBackendAsCanvas =
+    contentBackend == canvasBackend ||
+    (contentBackend == "none" && canvasBackend == "cairo");
+
+  sandbox.remoteCanvas =
+    prefs.getBoolPref("gfx.canvas.remote") && sandbox.d2d && sandbox.gpuProcess;
+
+  sandbox.layersGPUAccelerated = g.windowUtils.layerManagerType != "Basic";
+  sandbox.d3d11 = g.windowUtils.layerManagerType == "Direct3D 11";
+  sandbox.d3d9 = g.windowUtils.layerManagerType == "Direct3D 9";
+  sandbox.layersOpenGL = g.windowUtils.layerManagerType == "OpenGL";
+  sandbox.swgl = g.windowUtils.layerManagerType.startsWith(
+    "WebRender (Software"
+  );
+  sandbox.layersOMTC = g.windowUtils.layerManagerRemote == true;
+
+  // Shortcuts for widget toolkits.
+  sandbox.Android = xr.OS == "Android";
+  sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
+  sandbox.gtkWidget = xr.widgetToolkit == "gtk";
+  sandbox.qtWidget = xr.widgetToolkit == "qt";
+  sandbox.winWidget = xr.widgetToolkit == "windows";
+
+  sandbox.is64Bit = xr.is64Bit;
+
+  // Use this to annotate reftests that fail in drawSnapshot, but
+  // the reason hasn't been investigated (or fixed) yet.
+  sandbox.useDrawSnapshot = g.useDrawSnapshot;
+  // Use this to annotate reftests that use functionality
+  // that isn't available to drawSnapshot (like any sort of
+  // compositor feature such as async scrolling).
+  sandbox.unsupportedWithDrawSnapshot = g.useDrawSnapshot;
+
+  sandbox.retainedDisplayList =
+    prefs.getBoolPref("layout.display-list.retain") && !sandbox.useDrawSnapshot;
+
+  // Needed to specifically test the new and old behavior. This will eventually be removed.
+  sandbox.retainedDisplayListNew =
+    sandbox.retainedDisplayList &&
+    prefs.getBoolPref("layout.display-list.retain.sc");
+
+  // GeckoView is currently uniquely identified by "android + e10s" but
+  // we might want to make this condition more precise in the future.
+  sandbox.geckoview = sandbox.Android && g.browserIsRemote;
+
+  // Scrollbars that are semi-transparent. See bug 1169666.
+  sandbox.transparentScrollbars = xr.widgetToolkit == "gtk";
+
+  var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
+  if (sandbox.Android) {
+    // This is currently used to distinguish Android 4.0.3 (SDK version 15)
+    // and later from Android 2.x
+    sandbox.AndroidVersion = sysInfo.getPropertyAsInt32("version");
+
+    sandbox.emulator = readGfxInfo(gfxInfo, "adapterDeviceID").includes(
+      "Android Emulator"
+    );
+    sandbox.device = !sandbox.emulator;
+  }
+
+  sandbox.MinGW = sandbox.winWidget && sysInfo.getPropertyAsBool("isMinGW");
+
+  sandbox.AddressSanitizer = AppConstants.ASAN;
+  sandbox.ThreadSanitizer = AppConstants.TSAN;
+  sandbox.webrtc = AppConstants.MOZ_WEBRTC;
+  sandbox.jxl = AppConstants.MOZ_JXL;
+
+  sandbox.compareRetainedDisplayLists = g.compareRetainedDisplayLists;
+
+  sandbox.release_or_beta = AppConstants.RELEASE_OR_BETA;
+
+  var hh = Cc[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].getService(
+    Ci.nsIHttpProtocolHandler
+  );
+  var httpProps = [
+    "userAgent",
+    "appName",
+    "appVersion",
+    "vendor",
+    "vendorSub",
+    "product",
+    "productSub",
+    "platform",
+    "oscpu",
+    "language",
+    "misc",
+  ];
+  sandbox.http = new sandbox.Object();
+  httpProps.forEach(x => (sandbox.http[x] = hh[x]));
+
+  // set to specific Android13 version (Pixel 5 in CI)
+  sandbox.Android13 =
+    sandbox.Android && sandbox.http["platform"] == "Android 13";
+
+  // Set OSX to be the Mac OS X version, as an integer, or undefined
+  // for other platforms.  The integer is formed by 100 times the
+  // major version plus the minor version, so 1006 for 10.6, 1010 for
+  // 10.10, etc.
+  var osxmatch = /Mac OS X (\d+).(\d+)$/.exec(hh.oscpu);
+  sandbox.OSX = osxmatch
+    ? parseInt(osxmatch[1]) * 100 + parseInt(osxmatch[2])
+    : undefined;
+
+  // config specific prefs
+  sandbox.appleSilicon = prefs.getBoolPref("sandbox.apple_silicon", false);
+
+  sandbox.gpuProcessForceEnabled = prefs.getBoolPref(
+    "layers.gpu-process.force-enabled",
+    false
+  );
+
+  sandbox.prefs = Cu.cloneInto(
+    {
+      getBoolPref: function (p) {
+        return prefs.getBoolPref(p);
+      },
+      getIntPref: function (p) {
+        return prefs.getIntPref(p);
+      },
+    },
+    sandbox,
+    { cloneFunctions: true }
+  );
+
+  // Tests shouldn't care about this except for when they need to
+  // crash the content process
+  sandbox.browserIsRemote = g.browserIsRemote;
+  sandbox.browserIsFission = g.browserIsFission;
+
+  try {
+    sandbox.asyncPan =
+      g.containingWindow.docShell.asyncPanZoomEnabled &&
+      !sandbox.useDrawSnapshot;
+  } catch (e) {
+    sandbox.asyncPan = false;
+  }
+
+  // Graphics features
+  sandbox.usesRepeatResampling = sandbox.d2d;
+
+  // Running in a test-verify session?
+  sandbox.verify = prefs.getBoolPref("reftest.verify", false);
+
+  // Running with a variant enabled?
+  sandbox.fission = Services.appinfo.fissionAutostart;
+  sandbox.serviceWorkerE10s = true;
+
+  if (!g.dumpedConditionSandbox) {
+    g.logger.info(
+      "Dumping representation of sandbox which can be used for expectation annotations"
+    );
+    for (let entry of Object.entries(Cu.waiveXrays(sandbox)).sort((a, b) =>
+      a[0].localeCompare(b[0])
+    )) {
+      let value =
+        typeof entry[1] === "object" ? JSON.stringify(entry[1]) : entry[1];
+      g.logger.info(`    ${entry[0]}: ${value}`);
     }
+    g.dumpedConditionSandbox = true;
+  }
 
-    try {
-      sandbox.d2d = readGfxInfo(gfxInfo, "D2DEnabled");
-      sandbox.dwrite = readGfxInfo(gfxInfo, "DWriteEnabled");
-      sandbox.embeddedInFirefoxReality = readGfxInfo(gfxInfo, "EmbeddedInFirefoxReality");
-    } catch (e) {
-      sandbox.d2d = false;
-      sandbox.dwrite = false;
-      sandbox.embeddedInFirefoxReality = false;
-    }
-
-    var canvasBackend = readGfxInfo(gfxInfo, "AzureCanvasBackend");
-    var contentBackend = readGfxInfo(gfxInfo, "AzureContentBackend");
-
-    sandbox.gpuProcess = gfxInfo.usingGPUProcess;
-    sandbox.azureCairo = canvasBackend == "cairo";
-    sandbox.azureSkia = canvasBackend == "skia";
-    sandbox.skiaContent = contentBackend == "skia";
-    sandbox.azureSkiaGL = false;
-    // true if we are using the same Azure backend for rendering canvas and content
-    sandbox.contentSameGfxBackendAsCanvas = contentBackend == canvasBackend
-                                            || (contentBackend == "none" && canvasBackend == "cairo");
-
-    sandbox.remoteCanvas = prefs.getBoolPref("gfx.canvas.remote") && sandbox.d2d && sandbox.gpuProcess;
-
-    sandbox.layersGPUAccelerated =
-      g.windowUtils.layerManagerType != "Basic";
-    sandbox.d3d11 =
-      g.windowUtils.layerManagerType == "Direct3D 11";
-    sandbox.d3d9 =
-      g.windowUtils.layerManagerType == "Direct3D 9";
-    sandbox.layersOpenGL =
-      g.windowUtils.layerManagerType == "OpenGL";
-    sandbox.swgl =
-      g.windowUtils.layerManagerType.startsWith("WebRender (Software");
-    sandbox.layersOMTC =
-      g.windowUtils.layerManagerRemote == true;
-
-    // Shortcuts for widget toolkits.
-    sandbox.Android = xr.OS == "Android";
-    sandbox.cocoaWidget = xr.widgetToolkit == "cocoa";
-    sandbox.gtkWidget = xr.widgetToolkit == "gtk";
-    sandbox.qtWidget = xr.widgetToolkit == "qt";
-    sandbox.winWidget = xr.widgetToolkit == "windows";
-
-    sandbox.is64Bit = xr.is64Bit;
-
-    // Use this to annotate reftests that fail in drawSnapshot, but
-    // the reason hasn't been investigated (or fixed) yet.
-    sandbox.useDrawSnapshot = g.useDrawSnapshot;
-    // Use this to annotate reftests that use functionality
-    // that isn't available to drawSnapshot (like any sort of
-    // compositor feature such as async scrolling).
-    sandbox.unsupportedWithDrawSnapshot = g.useDrawSnapshot;
-
-    sandbox.retainedDisplayList =
-      prefs.getBoolPref("layout.display-list.retain") && !sandbox.useDrawSnapshot;
-
-    // Needed to specifically test the new and old behavior. This will eventually be removed.
-    sandbox.retainedDisplayListNew =
-        sandbox.retainedDisplayList && prefs.getBoolPref("layout.display-list.retain.sc");
-
-    // GeckoView is currently uniquely identified by "android + e10s" but
-    // we might want to make this condition more precise in the future.
-    sandbox.geckoview = (sandbox.Android && g.browserIsRemote);
-
-    // Scrollbars that are semi-transparent. See bug 1169666.
-    sandbox.transparentScrollbars = xr.widgetToolkit == "gtk";
-
-    var sysInfo = Cc["@mozilla.org/system-info;1"].getService(Ci.nsIPropertyBag2);
-    if (sandbox.Android) {
-        // This is currently used to distinguish Android 4.0.3 (SDK version 15)
-        // and later from Android 2.x
-        sandbox.AndroidVersion = sysInfo.getPropertyAsInt32("version");
-
-        sandbox.emulator = readGfxInfo(gfxInfo, "adapterDeviceID").includes("Android Emulator");
-        sandbox.device = !sandbox.emulator;
-    }
-
-    sandbox.MinGW = sandbox.winWidget && sysInfo.getPropertyAsBool("isMinGW");
-
-    sandbox.AddressSanitizer = AppConstants.ASAN;
-    sandbox.ThreadSanitizer = AppConstants.TSAN;
-    sandbox.webrtc = AppConstants.MOZ_WEBRTC;
-    sandbox.jxl = AppConstants.MOZ_JXL;
-
-    sandbox.compareRetainedDisplayLists = g.compareRetainedDisplayLists;
-
-    sandbox.release_or_beta = AppConstants.RELEASE_OR_BETA;
-
-    var hh = Cc[NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX + "http"].
-                 getService(Ci.nsIHttpProtocolHandler);
-    var httpProps = ["userAgent", "appName", "appVersion", "vendor",
-                     "vendorSub", "product", "productSub", "platform",
-                     "oscpu", "language", "misc"];
-    sandbox.http = new sandbox.Object();
-    httpProps.forEach((x) => sandbox.http[x] = hh[x]);
-
-    // set to specific Android13 version (Pixel 5 in CI)
-    sandbox.Android13 = sandbox.Android && (sandbox.http["platform"] == "Android 13");
-
-    // Set OSX to be the Mac OS X version, as an integer, or undefined
-    // for other platforms.  The integer is formed by 100 times the
-    // major version plus the minor version, so 1006 for 10.6, 1010 for
-    // 10.10, etc.
-    var osxmatch = /Mac OS X (\d+).(\d+)$/.exec(hh.oscpu);
-    sandbox.OSX = osxmatch ? parseInt(osxmatch[1]) * 100 + parseInt(osxmatch[2]) : undefined;
-
-    // config specific prefs
-    sandbox.appleSilicon = prefs.getBoolPref("sandbox.apple_silicon", false);
-
-    sandbox.gpuProcessForceEnabled = prefs.getBoolPref("layers.gpu-process.force-enabled", false);
-
-    sandbox.prefs = Cu.cloneInto({
-        getBoolPref: function(p) { return prefs.getBoolPref(p); },
-        getIntPref:  function(p) { return prefs.getIntPref(p); }
-    }, sandbox, { cloneFunctions: true });
-
-    // Tests shouldn't care about this except for when they need to
-    // crash the content process
-    sandbox.browserIsRemote = g.browserIsRemote;
-    sandbox.browserIsFission = g.browserIsFission;
-
-    try {
-        sandbox.asyncPan = g.containingWindow.docShell.asyncPanZoomEnabled && !sandbox.useDrawSnapshot;
-    } catch (e) {
-        sandbox.asyncPan = false;
-    }
-
-    // Graphics features
-    sandbox.usesRepeatResampling = sandbox.d2d;
-
-    // Running in a test-verify session?
-    sandbox.verify = prefs.getBoolPref("reftest.verify", false);
-
-    // Running with a variant enabled?
-    sandbox.fission = Services.appinfo.fissionAutostart;
-    sandbox.serviceWorkerE10s = true;
-
-    if (!g.dumpedConditionSandbox) {
-        g.logger.info("Dumping representation of sandbox which can be used for expectation annotations");
-        for (let entry of Object.entries(Cu.waiveXrays(sandbox)).sort((a, b) => a[0].localeCompare(b[0]))) {
-            let value = typeof entry[1] === "object" ? JSON.stringify(entry[1]) : entry[1];
-            g.logger.info(`    ${entry[0]}: ${value}`);
-        }
-        g.dumpedConditionSandbox = true;
-    }
-
-    return sandbox;
+  return sandbox;
 }
 
-function AddRetainedDisplayListTestPrefs(aSandbox, aTestPrefSettings,
-                                         aRefPrefSettings) {
-    AddPrefSettings("test-", "layout.display-list.retain", "true", aSandbox,
-                    aTestPrefSettings, aRefPrefSettings);
-    AddPrefSettings("ref-", "layout.display-list.retain", "false", aSandbox,
-                    aTestPrefSettings, aRefPrefSettings);
+function AddRetainedDisplayListTestPrefs(
+  aSandbox,
+  aTestPrefSettings,
+  aRefPrefSettings
+) {
+  AddPrefSettings(
+    "test-",
+    "layout.display-list.retain",
+    "true",
+    aSandbox,
+    aTestPrefSettings,
+    aRefPrefSettings
+  );
+  AddPrefSettings(
+    "ref-",
+    "layout.display-list.retain",
+    "false",
+    aSandbox,
+    aTestPrefSettings,
+    aRefPrefSettings
+  );
 }
 
-function AddPrefSettings(aWhere, aPrefName, aPrefValExpression, aSandbox, aTestPrefSettings, aRefPrefSettings) {
-    var prefVal = Cu.evalInSandbox("(" + aPrefValExpression + ")", aSandbox);
-    var prefType;
-    var valType = typeof(prefVal);
-    if (valType == "boolean") {
-        prefType = PREF_BOOLEAN;
-    } else if (valType == "string") {
-        prefType = PREF_STRING;
-    } else if (valType == "number" && (parseInt(prefVal) == prefVal)) {
-        prefType = PREF_INTEGER;
-    } else {
-        return false;
-    }
-    var setting = { name: aPrefName,
-                    type: prefType,
-                    value: prefVal };
+function AddPrefSettings(
+  aWhere,
+  aPrefName,
+  aPrefValExpression,
+  aSandbox,
+  aTestPrefSettings,
+  aRefPrefSettings
+) {
+  var prefVal = Cu.evalInSandbox("(" + aPrefValExpression + ")", aSandbox);
+  var prefType;
+  var valType = typeof prefVal;
+  if (valType == "boolean") {
+    prefType = PREF_BOOLEAN;
+  } else if (valType == "string") {
+    prefType = PREF_STRING;
+  } else if (valType == "number" && parseInt(prefVal) == prefVal) {
+    prefType = PREF_INTEGER;
+  } else {
+    return false;
+  }
+  var setting = { name: aPrefName, type: prefType, value: prefVal };
 
-    if (g.compareRetainedDisplayLists && aPrefName != "layout.display-list.retain") {
-        // ref-pref() is ignored, test-pref() and pref() are added to both
-        if (aWhere != "ref-") {
-            aTestPrefSettings.push(setting);
-            aRefPrefSettings.push(setting);
-        }
-    } else {
-        if (aWhere != "ref-") {
-            aTestPrefSettings.push(setting);
-        }
-        if (aWhere != "test-") {
-            aRefPrefSettings.push(setting);
-        }
+  if (
+    g.compareRetainedDisplayLists &&
+    aPrefName != "layout.display-list.retain"
+  ) {
+    // ref-pref() is ignored, test-pref() and pref() are added to both
+    if (aWhere != "ref-") {
+      aTestPrefSettings.push(setting);
+      aRefPrefSettings.push(setting);
     }
-    return true;
+  } else {
+    if (aWhere != "ref-") {
+      aTestPrefSettings.push(setting);
+    }
+    if (aWhere != "test-") {
+      aRefPrefSettings.push(setting);
+    }
+  }
+  return true;
 }
 
 function ExtractRange(matches, startIndex) {
-    return {
-        min: Number(matches[startIndex]),
-        max: Number(matches[startIndex + 1])
-    };
+  return {
+    min: Number(matches[startIndex]),
+    max: Number(matches[startIndex + 1]),
+  };
 }
 
 function ServeTestBase(aURL, depth) {
-    var listURL = aURL.QueryInterface(Ci.nsIFileURL);
-    var directory = listURL.file.parent;
+  var listURL = aURL.QueryInterface(Ci.nsIFileURL);
+  var directory = listURL.file.parent;
 
-    // Allow serving a tree that's an ancestor of the directory containing
-    // the files so that they can use resources in ../ (etc.).
-    var dirPath = "/";
-    while (depth > 0) {
-        dirPath = "/" + directory.leafName + dirPath;
-        directory = directory.parent;
-        --depth;
-    }
+  // Allow serving a tree that's an ancestor of the directory containing
+  // the files so that they can use resources in ../ (etc.).
+  var dirPath = "/";
+  while (depth > 0) {
+    dirPath = "/" + directory.leafName + dirPath;
+    directory = directory.parent;
+    --depth;
+  }
 
-    g.count++;
-    var path = "/" + Date.now() + "/" + g.count;
-    g.server.registerDirectory(path + "/", directory);
-    // this one is needed so tests can use example.org urls for cross origin testing
-    g.server.registerDirectory("/", directory);
+  g.count++;
+  var path = "/" + Date.now() + "/" + g.count;
+  g.server.registerDirectory(path + "/", directory);
+  // this one is needed so tests can use example.org urls for cross origin testing
+  g.server.registerDirectory("/", directory);
 
-    return g.ioService.newURI("http://localhost:" + g.httpServerPort + path + dirPath);
+  return g.ioService.newURI(
+    "http://localhost:" + g.httpServerPort + path + dirPath
+  );
 }
 
 function CreateUrls(test) {
-    let secMan = Cc[NS_SCRIPTSECURITYMANAGER_CONTRACTID]
-                    .getService(Ci.nsIScriptSecurityManager);
+  let secMan = Cc[NS_SCRIPTSECURITYMANAGER_CONTRACTID].getService(
+    Ci.nsIScriptSecurityManager
+  );
 
-    let manifestURL = g.ioService.newURI(test.manifest);
+  let manifestURL = g.ioService.newURI(test.manifest);
 
-    let testbase = manifestURL;
-    if (test.runHttp) {
-        testbase = ServeTestBase(manifestURL, test.httpDepth)
-    }
+  let testbase = manifestURL;
+  if (test.runHttp) {
+    testbase = ServeTestBase(manifestURL, test.httpDepth);
+  }
 
-    let testbasePrincipal = secMan.createContentPrincipal(testbase, {});
-    Services.perms.addFromPrincipal(testbasePrincipal, "allowXULXBL", Services.perms.ALLOW_ACTION);
+  let testbasePrincipal = secMan.createContentPrincipal(testbase, {});
+  Services.perms.addFromPrincipal(
+    testbasePrincipal,
+    "allowXULXBL",
+    Services.perms.ALLOW_ACTION
+  );
 
-    function FileToURI(file)
-    {
-        if (file === null)
-            return file;
+  function FileToURI(file) {
+    if (file === null) return file;
 
-        var testURI = g.ioService.newURI(file, null, testbase);
-        let isChromeOrViewSource = testURI.scheme == "chrome" || testURI.scheme == "view-source";
-        let principal = isChromeOrViewSource ? secMan.getSystemPrincipal() :
-                                               secMan.createContentPrincipal(manifestURL, {});
-        secMan.checkLoadURIWithPrincipal(principal, testURI,
-                                         Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT);
-        return testURI;
-    }
+    var testURI = g.ioService.newURI(file, null, testbase);
+    let isChromeOrViewSource =
+      testURI.scheme == "chrome" || testURI.scheme == "view-source";
+    let principal = isChromeOrViewSource
+      ? secMan.getSystemPrincipal()
+      : secMan.createContentPrincipal(manifestURL, {});
+    secMan.checkLoadURIWithPrincipal(
+      principal,
+      testURI,
+      Ci.nsIScriptSecurityManager.DISALLOW_SCRIPT
+    );
+    return testURI;
+  }
 
-    let files = [test.url1, test.url2];
-    [test.url1, test.url2] = files.map(FileToURI);
+  let files = [test.url1, test.url2];
+  [test.url1, test.url2] = files.map(FileToURI);
 
-    return test;
+  return test;
 }
 
 function TestIdentifier(aUrl, aManifestID) {
-    // Construct a platform-independent and location-independent test identifier for
-    // a url; normally the identifier looks like a posix-compliant relative file
-    // path.
-    // Test urls may be simple file names, chrome: urls with full paths, about:blank, etc.
-    if (aUrl.startsWith("about:") || aUrl.startsWith("data:")) {
-        return aUrl;
-    }
-    var pos = aUrl.lastIndexOf("/");
-    var url = (pos < 0) ? aUrl : aUrl.substring(pos + 1);
-    return (aManifestID + "/" + url);
+  // Construct a platform-independent and location-independent test identifier for
+  // a url; normally the identifier looks like a posix-compliant relative file
+  // path.
+  // Test urls may be simple file names, chrome: urls with full paths, about:blank, etc.
+  if (aUrl.startsWith("about:") || aUrl.startsWith("data:")) {
+    return aUrl;
+  }
+  var pos = aUrl.lastIndexOf("/");
+  var url = pos < 0 ? aUrl : aUrl.substring(pos + 1);
+  return aManifestID + "/" + url;
 }
 
 function AddTestItem(aTest, aFilter, aManifestID) {
-    if (!aFilter)
-        aFilter = [null, [], false];
+  if (!aFilter) aFilter = [null, [], false];
 
-    var identifier = TestIdentifier(aTest.url1, aManifestID);
-    if (aTest.url2 !== null) {
-        identifier = [identifier, aTest.type, TestIdentifier(aTest.url2, aManifestID)];
-    }
+  var identifier = TestIdentifier(aTest.url1, aManifestID);
+  if (aTest.url2 !== null) {
+    identifier = [
+      identifier,
+      aTest.type,
+      TestIdentifier(aTest.url2, aManifestID),
+    ];
+  }
 
-    var {url1, url2} = CreateUrls(Object.assign({}, aTest));
+  var { url1, url2 } = CreateUrls(Object.assign({}, aTest));
 
-    var globalFilter = aFilter[0];
-    var manifestFilter = aFilter[1];
-    var invertManifest = aFilter[2];
-    if (globalFilter && !globalFilter.test(url1.spec)) {
-        if (url2 === null)
-            return;
-        if (globalFilter && !globalFilter.test(url2.spec))
-            return;
-    }
-    if (manifestFilter && !(invertManifest ^ manifestFilter.test(url1.spec))) {
-        if (url2 === null)
-            return;
-        if (manifestFilter && !(invertManifest ^ manifestFilter.test(url2.spec)))
-            return;
-    }
-    if (g.focusFilterMode == FOCUS_FILTER_NEEDS_FOCUS_TESTS &&
-        !aTest.needsFocus)
-        return;
-    if (g.focusFilterMode == FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS &&
-        aTest.needsFocus)
-        return;
+  var globalFilter = aFilter[0];
+  var manifestFilter = aFilter[1];
+  var invertManifest = aFilter[2];
+  if (globalFilter && !globalFilter.test(url1.spec)) {
+    if (url2 === null) return;
+    if (globalFilter && !globalFilter.test(url2.spec)) return;
+  }
+  if (manifestFilter && !(invertManifest ^ manifestFilter.test(url1.spec))) {
+    if (url2 === null) return;
+    if (manifestFilter && !(invertManifest ^ manifestFilter.test(url2.spec)))
+      return;
+  }
+  if (g.focusFilterMode == FOCUS_FILTER_NEEDS_FOCUS_TESTS && !aTest.needsFocus)
+    return;
+  if (
+    g.focusFilterMode == FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS &&
+    aTest.needsFocus
+  )
+    return;
 
-    aTest.identifier = identifier;
-    g.urls.push(aTest);
-    // Periodically log progress to avoid no-output timeout on slow platforms.
-    // No-output timeouts during manifest parsing have been a problem for
-    // jsreftests on Android/debug. Any logging resets the no-output timer,
-    // even debug logging which is normally not displayed.
-    if ((g.urls.length % 5000) == 0)
-        g.logger.debug(g.urls.length + " tests found...");
+  aTest.identifier = identifier;
+  g.urls.push(aTest);
+  // Periodically log progress to avoid no-output timeout on slow platforms.
+  // No-output timeouts during manifest parsing have been a problem for
+  // jsreftests on Android/debug. Any logging resets the no-output timer,
+  // even debug logging which is normally not displayed.
+  if (g.urls.length % 5000 == 0)
+    g.logger.debug(g.urls.length + " tests found...");
 }
diff --git a/layout/tools/reftest/reftest-analyzer-structured.xhtml b/layout/tools/reftest/reftest-analyzer-structured.xhtml
index 7780c09faa0d..fe257bec4bee 100644
--- a/layout/tools/reftest/reftest-analyzer-structured.xhtml
+++ b/layout/tools/reftest/reftest-analyzer-structured.xhtml
@@ -20,628 +20,741 @@ Features to add:
 -->
 <!DOCTYPE html>
 <html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Reftest analyzer</title>
-  <style type="text/css"><![CDATA[
+  <head>
+    <title>Reftest analyzer</title>
+    <style type="text/css">
+      <![CDATA[
 
-  html, body { margin: 0; }
-  html { padding: 0; }
-  body { padding: 4px; }
+        html, body { margin: 0; }
+        html { padding: 0; }
+        body { padding: 4px; }
 
-  #pixelarea, #itemlist, #images { position: absolute; }
-  #itemlist, #images { overflow: auto; }
-  #pixelarea { top: 0; left: 0; width: 320px; height: 84px; overflow: visible }
-  #itemlist { top: 84px; left: 0; width: 320px; bottom: 0; }
-  #images { top: 0; bottom: 0; left: 320px; right: 0; }
+        #pixelarea, #itemlist, #images { position: absolute; }
+        #itemlist, #images { overflow: auto; }
+        #pixelarea { top: 0; left: 0; width: 320px; height: 84px; overflow: visible }
+        #itemlist { top: 84px; left: 0; width: 320px; bottom: 0; }
+        #images { top: 0; bottom: 0; left: 320px; right: 0; }
 
-  #leftpane { width: 320px; }
-  #images { position: fixed; top: 10px; left: 340px; }
+        #leftpane { width: 320px; }
+        #images { position: fixed; top: 10px; left: 340px; }
 
-  form#imgcontrols { margin: 0; display: block; }
+        form#imgcontrols { margin: 0; display: block; }
 
-  #itemlist > table { border-collapse: collapse; }
-  #itemlist > table > tbody > tr > td { border: 1px solid; padding: 1px; }
-  #itemlist td.activeitem { background-color: yellow; }
+        #itemlist > table { border-collapse: collapse; }
+        #itemlist > table > tbody > tr > td { border: 1px solid; padding: 1px; }
+        #itemlist td.activeitem { background-color: yellow; }
 
-  /*
-  #itemlist > table > tbody > tr.pass > td.url { background: lime; }
-  #itemlist > table > tbody > tr.fail > td.url { background: red; }
-  */
+        /*
+        #itemlist > table > tbody > tr.pass > td.url { background: lime; }
+        #itemlist > table > tbody > tr.fail > td.url { background: red; }
+        */
 
-  #magnification > svg { display: block; width: 84px; height: 84px; }
+        #magnification > svg { display: block; width: 84px; height: 84px; }
 
-  #pixelinfo { font: small sans-serif; position: absolute; width: 200px; left: 84px; }
-  #pixelinfo table { border-collapse: collapse; }
-  #pixelinfo table th { white-space: nowrap; text-align: left; padding: 0; }
-  #pixelinfo table td { font-family: monospace; padding: 0 0 0 0.25em; }
+        #pixelinfo { font: small sans-serif; position: absolute; width: 200px; left: 84px; }
+        #pixelinfo table { border-collapse: collapse; }
+        #pixelinfo table th { white-space: nowrap; text-align: left; padding: 0; }
+        #pixelinfo table td { font-family: monospace; padding: 0 0 0 0.25em; }
 
-  #pixelhint { display: inline; color: #88f; cursor: help; }
-  #pixelhint > * { display: none; position: absolute; margin: 8px 0 0 8px; padding: 4px; width: 400px; background: #ffa; color: black; box-shadow: 3px 3px 2px #888; z-index: 1; }
-  #pixelhint:hover { color: #000; }
-  #pixelhint:hover > * { display: block; }
-  #pixelhint p { margin: 0; }
-  #pixelhint p + p { margin-top: 1em; }
+        #pixelhint { display: inline; color: #88f; cursor: help; }
+        #pixelhint > * { display: none; position: absolute; margin: 8px 0 0 8px; padding: 4px; width: 400px; background: #ffa; color: black; box-shadow: 3px 3px 2px #888; z-index: 1; }
+        #pixelhint:hover { color: #000; }
+        #pixelhint:hover > * { display: block; }
+        #pixelhint p { margin: 0; }
+        #pixelhint p + p { margin-top: 1em; }
 
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
+        ]]>
+    </style>
+    <script type="text/javascript">
+      <![CDATA[
 
-var XLINK_NS = "http://www.w3.org/1999/xlink";
-var SVG_NS = "http://www.w3.org/2000/svg";
-var IMAGE_NOT_AVAILABLE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAASCAYAAADczdVTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHy0lEQVRoge2aX2hb5xnGf2dYabROgqQkpMuKnWUJLmxHMFaa/SscteQiF5EvUgqLctEVrDJKK1+MolzkQr4IctgW+SLIheJc1BpFpswJw92FbaZsTCGTL0465AtntUekJdJ8lByVHbnnwLsLKbKdSJbiZBVjeuAYn+/P+z3fc97vfd9zbEVEhB566BK+1m0CPfx/o+eAPXQVbR3QqVapOl8FlR46h0O1Wu02iacCZfsasMKEz8vbx1JYE6fY/dXx6mEbFObPcvDVDBlznpc9G+2r8xNcvLqK2w39r4UI+fs7tFjmytgFFu718865EIebPGincI3zFz7Bcrtx97/GL0P+p+IPbSOgRwXtW3vpewqL/a/g5rgf39hit2m0hGUAHOHrrq3trmef4/lDB7Ay57n01zuPZXPX7jUunv+Yf9ktR7D/0CHca7/n3KXPsHbAuynkCWCZptgiImKLaVqP9NuW1bT9ceybpr3j+WJbYrVa3rbEatGZi2uixvWdrysilmWKae2M+5PqlktoosayLfubcrN10dAk24aynUsIxMVsadwUs+EX7dEyAlaXLqMoCj6fj5HkUqO9MD+Govjx+xXcXi+uoRAhvwuv182Z8Ws4AJUlxoZ8uNxuvF43ii/EtdXNNUuV68lR/IqC4gsxPj7KkE/BF5qmClRXrzFSt+/1ulDOjLNU6eQ4OcyPDqH4hhg5O4LicuN2K4xcvk6jjHUKJM8O1fvcKMoZkouFOq1VPp1OcuXGAvrvfsv0lWmSySTzN0sdH+jyYhK/ouB2e/G6XfjPJikBVG8SUhT8fl99nwVGfQp+vx+f4iO5VO1AtwJjfgXF58M/kqSVJP9ef0xuAI6NlwWmL41xxqeg+PyMXr72yBqW3cI4JaZHh1DcXrxeLy5liORiB7q1PiZFyeV0mQqz9TRZeUmFVUGLSjqdkgCIFp2RTCosEJOiiIihSyKWkDl9WYrFnCQCCNF0w0QmHhBQJTEzJ+nZSQmAoEYks2KIGBkJgASiM5I3LbGMnCSCCEQl38GJMvMZiag1e+nlFcmmIgKaZEwREaPGhWGZ1VfEMFZkNj4sgCSyhoihSzwSlqCGoAUlEo1IJByW+Oxyh+dZJJ+eklhiRnIrRcnrM6KCxLOmiNiipyICSGR2pTY2O1m7T2XEsNrrJmJLfjkn6amwoMbFaMEhG28eAVtzExErW3sOBCWVzkpmNiEqCOEZ2RyLTT3eJAKaMhVEUMOSXjHEtg3JTIUFkNTK9rGwbQrWm2xGb6QoWxIqEtdtEWO28aDtoi6JSFCAjUtL1AUzJA4SSW/IZ2VjjU0V0zEBJBiJSzwWk1g8IZEAAmrdidrBkoSKxB4IW08tGVNEzIxoIJM5a8v4SQ1RY5lGSy6x8xScz6QkHFBre1Zre49nH+y1KDEQLV7TcyU1LBCtHVppp9smxk2dYAMtHXA7blZWNJDZ4sZ4MxPbdHjrbc3WNuvOq4YlkYhLLBaXeKx2sLcrBUS2ScFtUbUBh3WgajvgOYgGuKjw4Rsqb1uvkssbWLbJXFQFqL/I9IEKa2WzYcqy16E2BNteB1R+cuwoRwcHGRx4nlfenWMuPclRDx3goSraqd+7Gj/Y5d76SrXLu3VKLYW1rMZbo/QpB4+9zt6fT1I0Law/LRMBaLzC7ePNuSgL7/2GpcotLr7+AZG5t9gH0Fa3zuFq1tiWG4DKs5tebV1NDDW1XYd26iWO9A8wODjAUfUN5ubm+Ch4ZFuuLRzQoVwqUCqXyN9fg3tFSuUShVIZhyr5O2vo94o42DwD/PP23fq8Bf5urLO+BoHBwxzc20c++wcmz+lAkWLFATwcf3+YDwIDhMYmuDw+wt5j5+C5ZwDYP/gSoLP6xX5+fOIkJ47/lIP8g49/Nc3tDj59OZUiRR3uFYsAVO/eZoE1yvkyeA6gAaff+zU3SxUcp8LilQucnoFTP3hhix19/garlQqFW9eZOBti9Mqt9mubXwBw+NALeDC4cfVDzgP3i3keUN/nf4uo+hEver/DRaK84/9mY/72uoFTKVMolVn5/HPgPvlSmVKhRL2bSrlEqVyidH8N/d7t2u/lakfcKneLgM4rvxhncbXA6tI8kTffB+0NjnrAqZYplcrk83ceXdtzgB+psHD7S/pfPs7JkydQB1x8dnWS2SVje9GaxkVLl+DmNNC4NJn/S6JxH5nJyNRwrW7Qi7oMgxBMyd9molvmRKO1cExgshG6l9NTEhkOynAkLlOJoKBuhPV8ZlK0h9aNTqVbv3ltEK/VIiAQEN0yZVLbuM+aImLoEgts3VdsJrfFil1M1/ZSv9RAROaWO8n/hkyF1Q3bgeFGygvPrDRG5Wcf1IJbq9rlNrrNbra96aqlUVMSWrNnNiw5uw23T/4o4Xq7FtA29h2My3K9WtETgRZr13UxdIk+pGswkpCcsX0N2OZD9BOgWqFsgWePp20KWb0ywkDgEIa8y55Gq0O5XKHP7cGz++l/haxWylgOuD17aG7eoVpxwL27RX8b27jZ42n1qdahXKrg2bfnUW0eQ7edoD232l+/LPp2pHvNfh8eT2f8/3sO2AZLyRAvns6gqToLOgxP6Uz87HvdoNJDF9E1B6ysLrLw5yW+3PUNvv3dH/L9wX3doNFDl9E1B+yhB+j9O1YPXcZ/AAl9BWJNvZE7AAAAAElFTkSuQmCC";
+      var XLINK_NS = "http://www.w3.org/1999/xlink";
+      var SVG_NS = "http://www.w3.org/2000/svg";
+      var IMAGE_NOT_AVAILABLE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAASCAYAAADczdVTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHy0lEQVRoge2aX2hb5xnGf2dYabROgqQkpMuKnWUJLmxHMFaa/SscteQiF5EvUgqLctEVrDJKK1+MolzkQr4IctgW+SLIheJc1BpFpswJw92FbaZsTCGTL0465AtntUekJdJ8lByVHbnnwLsLKbKdSJbiZBVjeuAYn+/P+z3fc97vfd9zbEVEhB566BK+1m0CPfx/o+eAPXQVbR3QqVapOl8FlR46h0O1Wu02iacCZfsasMKEz8vbx1JYE6fY/dXx6mEbFObPcvDVDBlznpc9G+2r8xNcvLqK2w39r4UI+fs7tFjmytgFFu718865EIebPGincI3zFz7Bcrtx97/GL0P+p+IPbSOgRwXtW3vpewqL/a/g5rgf39hit2m0hGUAHOHrrq3trmef4/lDB7Ay57n01zuPZXPX7jUunv+Yf9ktR7D/0CHca7/n3KXPsHbAuynkCWCZptgiImKLaVqP9NuW1bT9ceybpr3j+WJbYrVa3rbEatGZi2uixvWdrysilmWKae2M+5PqlktoosayLfubcrN10dAk24aynUsIxMVsadwUs+EX7dEyAlaXLqMoCj6fj5HkUqO9MD+Govjx+xXcXi+uoRAhvwuv182Z8Ws4AJUlxoZ8uNxuvF43ii/EtdXNNUuV68lR/IqC4gsxPj7KkE/BF5qmClRXrzFSt+/1ulDOjLNU6eQ4OcyPDqH4hhg5O4LicuN2K4xcvk6jjHUKJM8O1fvcKMoZkouFOq1VPp1OcuXGAvrvfsv0lWmSySTzN0sdH+jyYhK/ouB2e/G6XfjPJikBVG8SUhT8fl99nwVGfQp+vx+f4iO5VO1AtwJjfgXF58M/kqSVJP9ef0xuAI6NlwWmL41xxqeg+PyMXr72yBqW3cI4JaZHh1DcXrxeLy5liORiB7q1PiZFyeV0mQqz9TRZeUmFVUGLSjqdkgCIFp2RTCosEJOiiIihSyKWkDl9WYrFnCQCCNF0w0QmHhBQJTEzJ+nZSQmAoEYks2KIGBkJgASiM5I3LbGMnCSCCEQl38GJMvMZiag1e+nlFcmmIgKaZEwREaPGhWGZ1VfEMFZkNj4sgCSyhoihSzwSlqCGoAUlEo1IJByW+Oxyh+dZJJ+eklhiRnIrRcnrM6KCxLOmiNiipyICSGR2pTY2O1m7T2XEsNrrJmJLfjkn6amwoMbFaMEhG28eAVtzExErW3sOBCWVzkpmNiEqCOEZ2RyLTT3eJAKaMhVEUMOSXjHEtg3JTIUFkNTK9rGwbQrWm2xGb6QoWxIqEtdtEWO28aDtoi6JSFCAjUtL1AUzJA4SSW/IZ2VjjU0V0zEBJBiJSzwWk1g8IZEAAmrdidrBkoSKxB4IW08tGVNEzIxoIJM5a8v4SQ1RY5lGSy6x8xScz6QkHFBre1Zre49nH+y1KDEQLV7TcyU1LBCtHVppp9smxk2dYAMtHXA7blZWNJDZ4sZ4MxPbdHjrbc3WNuvOq4YlkYhLLBaXeKx2sLcrBUS2ScFtUbUBh3WgajvgOYgGuKjw4Rsqb1uvkssbWLbJXFQFqL/I9IEKa2WzYcqy16E2BNteB1R+cuwoRwcHGRx4nlfenWMuPclRDx3goSraqd+7Gj/Y5d76SrXLu3VKLYW1rMZbo/QpB4+9zt6fT1I0Law/LRMBaLzC7ePNuSgL7/2GpcotLr7+AZG5t9gH0Fa3zuFq1tiWG4DKs5tebV1NDDW1XYd26iWO9A8wODjAUfUN5ubm+Ch4ZFuuLRzQoVwqUCqXyN9fg3tFSuUShVIZhyr5O2vo94o42DwD/PP23fq8Bf5urLO+BoHBwxzc20c++wcmz+lAkWLFATwcf3+YDwIDhMYmuDw+wt5j5+C5ZwDYP/gSoLP6xX5+fOIkJ47/lIP8g49/Nc3tDj59OZUiRR3uFYsAVO/eZoE1yvkyeA6gAaff+zU3SxUcp8LilQucnoFTP3hhix19/garlQqFW9eZOBti9Mqt9mubXwBw+NALeDC4cfVDzgP3i3keUN/nf4uo+hEver/DRaK84/9mY/72uoFTKVMolVn5/HPgPvlSmVKhRL2bSrlEqVyidH8N/d7t2u/lakfcKneLgM4rvxhncbXA6tI8kTffB+0NjnrAqZYplcrk83ceXdtzgB+psHD7S/pfPs7JkydQB1x8dnWS2SVje9GaxkVLl+DmNNC4NJn/S6JxH5nJyNRwrW7Qi7oMgxBMyd9molvmRKO1cExgshG6l9NTEhkOynAkLlOJoKBuhPV8ZlK0h9aNTqVbv3ltEK/VIiAQEN0yZVLbuM+aImLoEgts3VdsJrfFil1M1/ZSv9RAROaWO8n/hkyF1Q3bgeFGygvPrDRG5Wcf1IJbq9rlNrrNbra96aqlUVMSWrNnNiw5uw23T/4o4Xq7FtA29h2My3K9WtETgRZr13UxdIk+pGswkpCcsX0N2OZD9BOgWqFsgWePp20KWb0ywkDgEIa8y55Gq0O5XKHP7cGz++l/haxWylgOuD17aG7eoVpxwL27RX8b27jZ42n1qdahXKrg2bfnUW0eQ7edoD232l+/LPp2pHvNfh8eT2f8/3sO2AZLyRAvns6gqToLOgxP6Uz87HvdoNJDF9E1B6ysLrLw5yW+3PUNvv3dH/L9wX3doNFDl9E1B+yhB+j9O1YPXcZ/AAl9BWJNvZE7AAAAAElFTkSuQmCC";
 
-var gPhases = null;
+      var gPhases = null;
 
-var gIDCache = {};
+      var gIDCache = {};
 
-var gMagPixPaths = [];     // 2D array of array-of-two <path> objects used in the pixel magnifier
-var gMagWidth = 5;         // number of zoomed in pixels to show horizontally
-var gMagHeight = 5;        // number of zoomed in pixels to show vertically
-var gMagZoom = 16;         // size of the zoomed in pixels
-var gImage1Data;           // ImageData object for the reference image
-var gImage2Data;           // ImageData object for the test output image
-var gFlashingPixels = [];  // array of <path> objects that should be flashed due to pixel color mismatch
-var gParams;
+      var gMagPixPaths = [];     // 2D array of array-of-two <path> objects used in the pixel magnifier
+      var gMagWidth = 5;         // number of zoomed in pixels to show horizontally
+      var gMagHeight = 5;        // number of zoomed in pixels to show vertically
+      var gMagZoom = 16;         // size of the zoomed in pixels
+      var gImage1Data;           // ImageData object for the reference image
+      var gImage2Data;           // ImageData object for the test output image
+      var gFlashingPixels = [];  // array of <path> objects that should be flashed due to pixel color mismatch
+      var gParams;
 
-function ID(id) {
-  if (!(id in gIDCache))
-    gIDCache[id] = document.getElementById(id);
-  return gIDCache[id];
-}
-
-function hash_parameters() {
-  var result = { };
-  var params = window.location.hash.substr(1).split(/[&;]/);
-  for (var i = 0; i < params.length; i++) {
-    var parts = params[i].split("=");
-    result[parts[0]] = unescape(unescape(parts[1]));
-  }
-  return result;
-}
-
-function load() {
-  gPhases = [ ID("entry"), ID("loading"), ID("viewer") ];
-  build_mag();
-  gParams = hash_parameters();
-  if (gParams.log) {
-    show_phase("loading");
-    process_log(gParams.log);
-  } else if (gParams.logurl) {
-    show_phase("loading");
-    var req = new XMLHttpRequest();
-    req.onreadystatechange = function() {
-      if (req.readyState === 4) {
-        process_log(req.responseText);
+      function ID(id) {
+        if (!(id in gIDCache))
+          gIDCache[id] = document.getElementById(id);
+        return gIDCache[id];
       }
-    };
-    req.open('GET', gParams.logurl, true);
-    req.send();
-  }
-  window.addEventListener('keypress', handle_keyboard_shortcut);
-  ID("image1").addEventListener('error', image_load_error);
-  ID("image2").addEventListener('error', image_load_error);
-}
 
-function image_load_error(e) {
-  e.target.setAttributeNS(XLINK_NS, "xlink:href", IMAGE_NOT_AVAILABLE);
-}
+      function hash_parameters() {
+        var result = { };
+        var params = window.location.hash.substr(1).split(/[&;]/);
+        for (var i = 0; i < params.length; i++) {
+          var parts = params[i].split("=");
+          result[parts[0]] = unescape(unescape(parts[1]));
+        }
+        return result;
+      }
 
-function build_mag() {
-  var mag = ID("mag");
+      function load() {
+        gPhases = [ ID("entry"), ID("loading"), ID("viewer") ];
+        build_mag();
+        gParams = hash_parameters();
+        if (gParams.log) {
+          show_phase("loading");
+          process_log(gParams.log);
+        } else if (gParams.logurl) {
+          show_phase("loading");
+          var req = new XMLHttpRequest();
+          req.onreadystatechange = function() {
+            if (req.readyState === 4) {
+              process_log(req.responseText);
+            }
+          };
+          req.open('GET', gParams.logurl, true);
+          req.send();
+        }
+        window.addEventListener('keypress', handle_keyboard_shortcut);
+        ID("image1").addEventListener('error', image_load_error);
+        ID("image2").addEventListener('error', image_load_error);
+      }
 
-  var r = document.createElementNS(SVG_NS, "rect");
-  r.setAttribute("x", gMagZoom * -gMagWidth / 2);
-  r.setAttribute("y", gMagZoom * -gMagHeight / 2);
-  r.setAttribute("width", gMagZoom * gMagWidth);
-  r.setAttribute("height", gMagZoom * gMagHeight);
-  mag.appendChild(r);
+      function image_load_error(e) {
+        e.target.setAttributeNS(XLINK_NS, "xlink:href", IMAGE_NOT_AVAILABLE);
+      }
 
-  mag.setAttribute("transform", "translate(" + (gMagZoom * (gMagWidth / 2) + 1) + "," + (gMagZoom * (gMagHeight / 2) + 1) + ")");
+      function build_mag() {
+        var mag = ID("mag");
 
-  for (var x = 0; x < gMagWidth; x++) {
-    gMagPixPaths[x] = [];
-    for (var y = 0; y < gMagHeight; y++) {
-      var p1 = document.createElementNS(SVG_NS, "path");
-      p1.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "h" + -gMagZoom + "v" + gMagZoom);
-      p1.setAttribute("stroke", "black");
-      p1.setAttribute("stroke-width", "1px");
-      p1.setAttribute("fill", "#aaa");
+        var r = document.createElementNS(SVG_NS, "rect");
+        r.setAttribute("x", gMagZoom * -gMagWidth / 2);
+        r.setAttribute("y", gMagZoom * -gMagHeight / 2);
+        r.setAttribute("width", gMagZoom * gMagWidth);
+        r.setAttribute("height", gMagZoom * gMagHeight);
+        mag.appendChild(r);
 
-      var p2 = document.createElementNS(SVG_NS, "path");
-      p2.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "v" + gMagZoom + "h" + -gMagZoom);
-      p2.setAttribute("stroke", "black");
-      p2.setAttribute("stroke-width", "1px");
-      p2.setAttribute("fill", "#888");
+        mag.setAttribute("transform", "translate(" + (gMagZoom * (gMagWidth / 2) + 1) + "," + (gMagZoom * (gMagHeight / 2) + 1) + ")");
 
-      mag.appendChild(p1);
-      mag.appendChild(p2);
-      gMagPixPaths[x][y] = [p1, p2];
-    }
-  }
+        for (var x = 0; x < gMagWidth; x++) {
+          gMagPixPaths[x] = [];
+          for (var y = 0; y < gMagHeight; y++) {
+            var p1 = document.createElementNS(SVG_NS, "path");
+            p1.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "h" + -gMagZoom + "v" + gMagZoom);
+            p1.setAttribute("stroke", "black");
+            p1.setAttribute("stroke-width", "1px");
+            p1.setAttribute("fill", "#aaa");
 
-  var flashedOn = false;
-  setInterval(function() {
-    flashedOn = !flashedOn;
-    flash_pixels(flashedOn);
-  }, 500);
-}
+            var p2 = document.createElementNS(SVG_NS, "path");
+            p2.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "v" + gMagZoom + "h" + -gMagZoom);
+            p2.setAttribute("stroke", "black");
+            p2.setAttribute("stroke-width", "1px");
+            p2.setAttribute("fill", "#888");
 
-function show_phase(phaseid) {
-  for (var i in gPhases) {
-    var phase = gPhases[i];
-    phase.style.display = (phase.id == phaseid) ? "" : "none";
-  }
+            mag.appendChild(p1);
+            mag.appendChild(p2);
+            gMagPixPaths[x][y] = [p1, p2];
+          }
+        }
 
-  if (phase == "viewer")
-    ID("images").style.display = "none";
-}
+        var flashedOn = false;
+        setInterval(function() {
+          flashedOn = !flashedOn;
+          flash_pixels(flashedOn);
+        }, 500);
+      }
 
-function fileentry_changed() {
-  show_phase("loading");
-  var input = ID("fileentry");
-  var files = input.files;
-  if (files.length > 0) {
-    // Only handle the first file; don't handle multiple selection.
-    // The parts of the log we care about are ASCII-only.  Since we
-    // can ignore lines we don't care about, best to read in as
-    // iso-8859-1, which guarantees we don't get decoding errors.
-    var fileReader = new FileReader();
-    fileReader.onload = function(e) {
-      var log = null;
+      function show_phase(phaseid) {
+        for (var i in gPhases) {
+          var phase = gPhases[i];
+          phase.style.display = (phase.id == phaseid) ? "" : "none";
+        }
 
-      log = e.target.result;
+        if (phase == "viewer")
+          ID("images").style.display = "none";
+      }
 
-      if (log)
+      function fileentry_changed() {
+        show_phase("loading");
+        var input = ID("fileentry");
+        var files = input.files;
+        if (files.length > 0) {
+          // Only handle the first file; don't handle multiple selection.
+          // The parts of the log we care about are ASCII-only.  Since we
+          // can ignore lines we don't care about, best to read in as
+          // iso-8859-1, which guarantees we don't get decoding errors.
+          var fileReader = new FileReader();
+          fileReader.onload = function(e) {
+            var log = null;
+
+            log = e.target.result;
+
+            if (log)
+              process_log(log);
+            else
+              show_phase("entry");
+          }
+          fileReader.readAsText(files[0], "iso-8859-1");
+        }
+        // So the user can process the same filename again (after
+        // overwriting the log), clear the value on the form input so we
+        // will always get an onchange event.
+        input.value = "";
+      }
+
+      function log_pasted() {
+        show_phase("loading");
+        var entry = ID("logentry");
+        var log = entry.value;
+        entry.value = "";
         process_log(log);
-      else
-        show_phase("entry");
-    }
-    fileReader.readAsText(files[0], "iso-8859-1");
-  }
-  // So the user can process the same filename again (after
-  // overwriting the log), clear the value on the form input so we
-  // will always get an onchange event.
-  input.value = "";
-}
+      }
 
-function log_pasted() {
-  show_phase("loading");
-  var entry = ID("logentry");
-  var log = entry.value;
-  entry.value = "";
-  process_log(log);
-}
+      var gTestItems;
 
-var gTestItems;
+      function process_log(contents) {
+        var lines = contents.split(/[\r\n]+/);
+        gTestItems = [];
+        for (var j in lines) {
+          var line = lines[j];
+          try {
+            var data = JSON.parse(line);
+          } catch(e) {
+            continue;
+          }
+          // Ignore duplicated output in logcat.
+          if (!data.action == "test_end" && data.status != "FAIL")
+            continue;
 
-function process_log(contents) {
-  var lines = contents.split(/[\r\n]+/);
-  gTestItems = [];
-  for (var j in lines) {
-    var line = lines[j];
-    try {
-      var data = JSON.parse(line);
-    } catch(e) {
-      continue;
-    }
-    // Ignore duplicated output in logcat.
-    if (!data.action == "test_end" && data.status != "FAIL")
-      continue;
+          if (!data.hasOwnProperty("extra") ||
+              !data.extra.hasOwnProperty("reftest_screenshots")) {
+            continue;
+          }
 
-    if (!data.hasOwnProperty("extra") ||
-        !data.extra.hasOwnProperty("reftest_screenshots")) {
-      continue;
-    }
+          var url = data.test;
+          var screenshots = data.extra.reftest_screenshots;
+          gTestItems.push(
+            {
+              pass: data.status === "PASS",
+              // only one of the following three should ever be true
+              unexpected: data.hasOwnProperty("expected"),
+              random: false,
+              skip: data.status == "SKIP",
+              url: url,
+              images: [],
+              imageLabels: []
+            });
 
-    var url = data.test;
-    var screenshots = data.extra.reftest_screenshots;
-    gTestItems.push(
-      {
-        pass: data.status === "PASS",
-        // only one of the following three should ever be true
-        unexpected: data.hasOwnProperty("expected"),
-        random: false,
-        skip: data.status == "SKIP",
-        url: url,
-        images: [],
-        imageLabels: []
-      });
-
-    var item = gTestItems[gTestItems.length - 1];
-    item.images.push("data:image/png;base64," + screenshots[0].screenshot);
-    item.imageLabels.push(screenshots[0].url);
-    if (screenshots.length > 1) {
-      item.images.push("data:image/png;base64," + screenshots[2].screenshot);
-      item.imageLabels.push(screenshots[2].url);
-    }
-  }
-  build_viewer();
-}
-
-function build_viewer() {
-  if (gTestItems.length == 0) {
-    show_phase("entry");
-    return;
-  }
-
-  var cell = ID("itemlist");
-  while (cell.childNodes.length > 0)
-    cell.removeChild(cell.childNodes[cell.childNodes.length - 1]);
-
-  var table = document.createElement("table");
-  var tbody = document.createElement("tbody");
-  table.appendChild(tbody);
-
-  for (var i in gTestItems) {
-    var item = gTestItems[i];
-
-    // optional url filter for only showing unexpected results
-    if (parseInt(gParams.only_show_unexpected) && !item.unexpected)
-      continue;
-
-    // XXX regardless skip expected pass items until we have filtering UI
-    if (item.pass && !item.unexpected)
-      continue;
-
-    var tr = document.createElement("tr");
-    var rowclass = item.pass ? "pass" : "fail";
-    var td;
-    var text;
-
-    td = document.createElement("td");
-    text = "";
-    if (item.unexpected) { text += "!"; rowclass += " unexpected"; }
-    if (item.random) { text += "R"; rowclass += " random"; }
-    if (item.skip) { text += "S"; rowclass += " skip"; }
-    td.appendChild(document.createTextNode(text));
-    tr.appendChild(td);
-
-    td = document.createElement("td");
-    td.id = "item" + i;
-    td.className = "url";
-    // Only display part of URL after "/mozilla/".
-    var match = item.url.match(/\/mozilla\/(.*)/);
-    text = document.createTextNode(match ? match[1] : item.url);
-    if (item.images.length > 0) {
-      var a = document.createElement("a");
-      a.href = "javascript:show_images(" + i + ")";
-      a.appendChild(text);
-      td.appendChild(a);
-    } else {
-      td.appendChild(text);
-    }
-    tr.appendChild(td);
-
-    tbody.appendChild(tr);
-  }
-
-  cell.appendChild(table);
-
-  show_phase("viewer");
-}
-
-function get_image_data(src, whenReady) {
-  var img = new Image();
-  img.onload = function() {
-    var canvas = document.createElement("canvas");
-    canvas.width = img.naturalWidth;
-    canvas.height = img.naturalHeight;
-
-    var ctx = canvas.getContext("2d");
-    ctx.drawImage(img, 0, 0);
-
-    whenReady(ctx.getImageData(0, 0, img.naturalWidth, img.naturalHeight));
-  };
-  img.src = src;
-}
-
-function sync_svg_size(imageData) {
-  // We need the size of the 'svg' and its 'image' elements to match the size
-  // of the ImageData objects that we're going to read pixels from or else our
-  // magnify() function will be very broken.
-  ID("svg").setAttribute("width", imageData.width);
-  ID("svg").setAttribute("height", imageData.height);
-}
-
-function show_images(i) {
-  var item = gTestItems[i];
-  var cell = ID("images");
-
-  // Remove activeitem class from any existing elements
-  var activeItems = document.querySelectorAll(".activeitem");
-  for (var activeItemIdx = activeItems.length; activeItemIdx-- != 0;) {
-    activeItems[activeItemIdx].classList.remove("activeitem");
-  }
-
-  ID("item" + i).classList.add("activeitem");
-  ID("image1").style.display = "";
-  ID("image2").style.display = "none";
-  ID("diffrect").style.display = "none";
-  ID("imgcontrols").reset();
-
-  ID("image1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
-  // Making the href be #image1 doesn't seem to work
-  ID("feimage1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
-  if (item.images.length == 1) {
-    ID("imgcontrols").style.display = "none";
-  } else {
-    ID("imgcontrols").style.display = "";
-
-    ID("image2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
-    // Making the href be #image2 doesn't seem to work
-    ID("feimage2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
-
-    ID("label1").textContent = 'Image ' + item.imageLabels[0];
-    ID("label2").textContent = 'Image ' + item.imageLabels[1];
-  }
-
-  cell.style.display = "";
-
-  get_image_data(item.images[0], function(data) { gImage1Data = data; sync_svg_size(gImage1Data); });
-  get_image_data(item.images[1], function(data) { gImage2Data = data });
-}
-
-function show_image(i) {
-  if (i == 1) {
-    ID("image1").style.display = "";
-    ID("image2").style.display = "none";
-  } else {
-    ID("image1").style.display = "none";
-    ID("image2").style.display = "";
-  }
-}
-
-function handle_keyboard_shortcut(event) {
-  switch (event.charCode) {
-  case 49: // "1" key
-    document.getElementById("radio1").checked = true;
-    show_image(1);
-    break;
-  case 50: // "2" key
-    document.getElementById("radio2").checked = true;
-    show_image(2);
-    break;
-  case 100: // "d" key
-    document.getElementById("differences").click();
-    break;
-  case 112: // "p" key
-    shift_images(-1);
-    break;
-  case 110: // "n" key
-    shift_images(1);
-    break;
-  }
-}
-
-function shift_images(dir) {
-  var activeItem = document.querySelector(".activeitem");
-  if (!activeItem) {
-    return;
-  }
-  for (var elm = activeItem; elm; elm = elm.parentElement) {
-    if (elm.tagName != "tr") {
-      continue;
-    }
-    elm = dir > 0 ? elm.nextElementSibling : elm.previousElementSibling;
-    if (elm) {
-      elm.getElementsByTagName("a")[0].click();
-    }
-    return;
-  }
-}
-
-function show_differences(cb) {
-  ID("diffrect").style.display = cb.checked ? "" : "none";
-}
-
-function flash_pixels(on) {
-  var stroke = on ? "red" : "black";
-  var strokeWidth = on ? "2px" : "1px";
-  for (var i = 0; i < gFlashingPixels.length; i++) {
-    gFlashingPixels[i].setAttribute("stroke", stroke);
-    gFlashingPixels[i].setAttribute("stroke-width", strokeWidth);
-  }
-}
-
-function cursor_point(evt) {
-  var m = evt.target.getScreenCTM().inverse();
-  var p = ID("svg").createSVGPoint();
-  p.x = evt.clientX;
-  p.y = evt.clientY;
-  p = p.matrixTransform(m);
-  return { x: Math.floor(p.x), y: Math.floor(p.y) };
-}
-
-function hex2(i) {
-  return (i < 16 ? "0" : "") + i.toString(16);
-}
-
-function canvas_pixel_as_hex(data, x, y) {
-  var offset = (y * data.width + x) * 4;
-  var r = data.data[offset];
-  var g = data.data[offset + 1];
-  var b = data.data[offset + 2];
-  return "#" + hex2(r) + hex2(g) + hex2(b);
-}
-
-function hex_as_rgb(hex) {
-  return "rgb(" + [parseInt(hex.substring(1, 3), 16), parseInt(hex.substring(3, 5), 16), parseInt(hex.substring(5, 7), 16)] + ")";
-}
-
-function magnify(evt) {
-  var { x: x, y: y } = cursor_point(evt);
-  var centerPixelColor1, centerPixelColor2;
-
-  var dx_lo = -Math.floor(gMagWidth / 2);
-  var dx_hi = Math.floor(gMagWidth / 2);
-  var dy_lo = -Math.floor(gMagHeight / 2);
-  var dy_hi = Math.floor(gMagHeight / 2);
-
-  flash_pixels(false);
-  gFlashingPixels = [];
-  for (var j = dy_lo; j <= dy_hi; j++) {
-    for (var i = dx_lo; i <= dx_hi; i++) {
-      var px = x + i;
-      var py = y + j;
-      var p1 = gMagPixPaths[i + dx_hi][j + dy_hi][0];
-      var p2 = gMagPixPaths[i + dx_hi][j + dy_hi][1];
-      // Here we just use the dimensions of gImage1Data since we expect test
-      // and reference to have the same dimensions.
-      if (px < 0 || py < 0 || px >= gImage1Data.width || py >= gImage1Data.height) {
-        p1.setAttribute("fill", "#aaa");
-        p2.setAttribute("fill", "#888");
-      } else {
-        var color1 = canvas_pixel_as_hex(gImage1Data, x + i, y + j);
-        var color2 = canvas_pixel_as_hex(gImage2Data, x + i, y + j);
-        p1.setAttribute("fill", color1);
-        p2.setAttribute("fill", color2);
-        if (color1 != color2) {
-          gFlashingPixels.push(p1, p2);
-          p1.parentNode.appendChild(p1);
-          p2.parentNode.appendChild(p2);
+          var item = gTestItems[gTestItems.length - 1];
+          item.images.push("data:image/png;base64," + screenshots[0].screenshot);
+          item.imageLabels.push(screenshots[0].url);
+          if (screenshots.length > 1) {
+            item.images.push("data:image/png;base64," + screenshots[2].screenshot);
+            item.imageLabels.push(screenshots[2].url);
+          }
         }
-        if (i == 0 && j == 0) {
-          centerPixelColor1 = color1;
-          centerPixelColor2 = color2;
+        build_viewer();
+      }
+
+      function build_viewer() {
+        if (gTestItems.length == 0) {
+          show_phase("entry");
+          return;
+        }
+
+        var cell = ID("itemlist");
+        while (cell.childNodes.length > 0)
+          cell.removeChild(cell.childNodes[cell.childNodes.length - 1]);
+
+        var table = document.createElement("table");
+        var tbody = document.createElement("tbody");
+        table.appendChild(tbody);
+
+        for (var i in gTestItems) {
+          var item = gTestItems[i];
+
+          // optional url filter for only showing unexpected results
+          if (parseInt(gParams.only_show_unexpected) && !item.unexpected)
+            continue;
+
+          // XXX regardless skip expected pass items until we have filtering UI
+          if (item.pass && !item.unexpected)
+            continue;
+
+          var tr = document.createElement("tr");
+          var rowclass = item.pass ? "pass" : "fail";
+          var td;
+          var text;
+
+          td = document.createElement("td");
+          text = "";
+          if (item.unexpected) { text += "!"; rowclass += " unexpected"; }
+          if (item.random) { text += "R"; rowclass += " random"; }
+          if (item.skip) { text += "S"; rowclass += " skip"; }
+          td.appendChild(document.createTextNode(text));
+          tr.appendChild(td);
+
+          td = document.createElement("td");
+          td.id = "item" + i;
+          td.className = "url";
+          // Only display part of URL after "/mozilla/".
+          var match = item.url.match(/\/mozilla\/(.*)/);
+          text = document.createTextNode(match ? match[1] : item.url);
+          if (item.images.length > 0) {
+            var a = document.createElement("a");
+            a.href = "javascript:show_images(" + i + ")";
+            a.appendChild(text);
+            td.appendChild(a);
+          } else {
+            td.appendChild(text);
+          }
+          tr.appendChild(td);
+
+          tbody.appendChild(tr);
+        }
+
+        cell.appendChild(table);
+
+        show_phase("viewer");
+      }
+
+      function get_image_data(src, whenReady) {
+        var img = new Image();
+        img.onload = function() {
+          var canvas = document.createElement("canvas");
+          canvas.width = img.naturalWidth;
+          canvas.height = img.naturalHeight;
+
+          var ctx = canvas.getContext("2d");
+          ctx.drawImage(img, 0, 0);
+
+          whenReady(ctx.getImageData(0, 0, img.naturalWidth, img.naturalHeight));
+        };
+        img.src = src;
+      }
+
+      function sync_svg_size(imageData) {
+        // We need the size of the 'svg' and its 'image' elements to match the size
+        // of the ImageData objects that we're going to read pixels from or else our
+        // magnify() function will be very broken.
+        ID("svg").setAttribute("width", imageData.width);
+        ID("svg").setAttribute("height", imageData.height);
+      }
+
+      function show_images(i) {
+        var item = gTestItems[i];
+        var cell = ID("images");
+
+        // Remove activeitem class from any existing elements
+        var activeItems = document.querySelectorAll(".activeitem");
+        for (var activeItemIdx = activeItems.length; activeItemIdx-- != 0;) {
+          activeItems[activeItemIdx].classList.remove("activeitem");
+        }
+
+        ID("item" + i).classList.add("activeitem");
+        ID("image1").style.display = "";
+        ID("image2").style.display = "none";
+        ID("diffrect").style.display = "none";
+        ID("imgcontrols").reset();
+
+        ID("image1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+        // Making the href be #image1 doesn't seem to work
+        ID("feimage1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+        if (item.images.length == 1) {
+          ID("imgcontrols").style.display = "none";
+        } else {
+          ID("imgcontrols").style.display = "";
+
+          ID("image2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+          // Making the href be #image2 doesn't seem to work
+          ID("feimage2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+
+          ID("label1").textContent = 'Image ' + item.imageLabels[0];
+          ID("label2").textContent = 'Image ' + item.imageLabels[1];
+        }
+
+        cell.style.display = "";
+
+        get_image_data(item.images[0], function(data) { gImage1Data = data; sync_svg_size(gImage1Data); });
+        get_image_data(item.images[1], function(data) { gImage2Data = data });
+      }
+
+      function show_image(i) {
+        if (i == 1) {
+          ID("image1").style.display = "";
+          ID("image2").style.display = "none";
+        } else {
+          ID("image1").style.display = "none";
+          ID("image2").style.display = "";
         }
       }
-    }
-  }
-  flash_pixels(true);
-  show_pixelinfo(x, y, centerPixelColor1, hex_as_rgb(centerPixelColor1), centerPixelColor2, hex_as_rgb(centerPixelColor2));
-}
 
-function show_pixelinfo(x, y, pix1rgb, pix1hex, pix2rgb, pix2hex) {
-  var pixelinfo = ID("pixelinfo");
-  ID("coords").textContent = [x, y];
-  ID("pix1hex").textContent = pix1hex;
-  ID("pix1rgb").textContent = pix1rgb;
-  ID("pix2hex").textContent = pix2hex;
-  ID("pix2rgb").textContent = pix2rgb;
-}
+      function handle_keyboard_shortcut(event) {
+        switch (event.charCode) {
+        case 49: // "1" key
+          document.getElementById("radio1").checked = true;
+          show_image(1);
+          break;
+        case 50: // "2" key
+          document.getElementById("radio2").checked = true;
+          show_image(2);
+          break;
+        case 100: // "d" key
+          document.getElementById("differences").click();
+          break;
+        case 112: // "p" key
+          shift_images(-1);
+          break;
+        case 110: // "n" key
+          shift_images(1);
+          break;
+        }
+      }
 
-  ]]></script>
+      function shift_images(dir) {
+        var activeItem = document.querySelector(".activeitem");
+        if (!activeItem) {
+          return;
+        }
+        for (var elm = activeItem; elm; elm = elm.parentElement) {
+          if (elm.tagName != "tr") {
+            continue;
+          }
+          elm = dir > 0 ? elm.nextElementSibling : elm.previousElementSibling;
+          if (elm) {
+            elm.getElementsByTagName("a")[0].click();
+          }
+          return;
+        }
+      }
 
-</head>
-<body onload="load()">
+      function show_differences(cb) {
+        ID("diffrect").style.display = cb.checked ? "" : "none";
+      }
 
-<div id="entry">
+      function flash_pixels(on) {
+        var stroke = on ? "red" : "black";
+        var strokeWidth = on ? "2px" : "1px";
+        for (var i = 0; i < gFlashingPixels.length; i++) {
+          gFlashingPixels[i].setAttribute("stroke", stroke);
+          gFlashingPixels[i].setAttribute("stroke-width", strokeWidth);
+        }
+      }
 
-<h1>Reftest analyzer: load raw structured log</h1>
+      function cursor_point(evt) {
+        var m = evt.target.getScreenCTM().inverse();
+        var p = ID("svg").createSVGPoint();
+        p.x = evt.clientX;
+        p.y = evt.clientY;
+        p = p.matrixTransform(m);
+        return { x: Math.floor(p.x), y: Math.floor(p.y) };
+      }
 
-<p>Either paste your log into this textarea:<br />
-<textarea cols="80" rows="10" id="logentry"/><br/>
-<input type="button" value="Process pasted log" onclick="log_pasted()" /></p>
+      function hex2(i) {
+        return (i < 16 ? "0" : "") + i.toString(16);
+      }
 
-<p>... or load it from a file:<br/>
-<input type="file" id="fileentry" onchange="fileentry_changed()" />
-</p>
-</div>
+      function canvas_pixel_as_hex(data, x, y) {
+        var offset = (y * data.width + x) * 4;
+        var r = data.data[offset];
+        var g = data.data[offset + 1];
+        var b = data.data[offset + 2];
+        return "#" + hex2(r) + hex2(g) + hex2(b);
+      }
 
-<div id="loading" style="display:none">Loading log...</div>
+      function hex_as_rgb(hex) {
+        return "rgb(" + [parseInt(hex.substring(1, 3), 16), parseInt(hex.substring(3, 5), 16), parseInt(hex.substring(5, 7), 16)] + ")";
+      }
 
-<div id="viewer" style="display:none">
-  <div id="pixelarea">
-    <div id="pixelinfo">
-      <table>
-        <tbody>
-          <tr><th>Pixel at:</th><td colspan="2" id="coords"/></tr>
-          <tr><th>Image 1:</th><td id="pix1rgb"></td><td id="pix1hex"></td></tr>
-          <tr><th>Image 2:</th><td id="pix2rgb"></td><td id="pix2hex"></td></tr>
-        </tbody>
-      </table>
-      <div>
-        <div id="pixelhint">★
+      function magnify(evt) {
+        var { x: x, y: y } = cursor_point(evt);
+        var centerPixelColor1, centerPixelColor2;
+
+        var dx_lo = -Math.floor(gMagWidth / 2);
+        var dx_hi = Math.floor(gMagWidth / 2);
+        var dy_lo = -Math.floor(gMagHeight / 2);
+        var dy_hi = Math.floor(gMagHeight / 2);
+
+        flash_pixels(false);
+        gFlashingPixels = [];
+        for (var j = dy_lo; j <= dy_hi; j++) {
+          for (var i = dx_lo; i <= dx_hi; i++) {
+            var px = x + i;
+            var py = y + j;
+            var p1 = gMagPixPaths[i + dx_hi][j + dy_hi][0];
+            var p2 = gMagPixPaths[i + dx_hi][j + dy_hi][1];
+            // Here we just use the dimensions of gImage1Data since we expect test
+            // and reference to have the same dimensions.
+            if (px < 0 || py < 0 || px >= gImage1Data.width || py >= gImage1Data.height) {
+              p1.setAttribute("fill", "#aaa");
+              p2.setAttribute("fill", "#888");
+            } else {
+              var color1 = canvas_pixel_as_hex(gImage1Data, x + i, y + j);
+              var color2 = canvas_pixel_as_hex(gImage2Data, x + i, y + j);
+              p1.setAttribute("fill", color1);
+              p2.setAttribute("fill", color2);
+              if (color1 != color2) {
+                gFlashingPixels.push(p1, p2);
+                p1.parentNode.appendChild(p1);
+                p2.parentNode.appendChild(p2);
+              }
+              if (i == 0 && j == 0) {
+                centerPixelColor1 = color1;
+                centerPixelColor2 = color2;
+              }
+            }
+          }
+        }
+        flash_pixels(true);
+        show_pixelinfo(x, y, centerPixelColor1, hex_as_rgb(centerPixelColor1), centerPixelColor2, hex_as_rgb(centerPixelColor2));
+      }
+
+      function show_pixelinfo(x, y, pix1rgb, pix1hex, pix2rgb, pix2hex) {
+        var pixelinfo = ID("pixelinfo");
+        ID("coords").textContent = [x, y];
+        ID("pix1hex").textContent = pix1hex;
+        ID("pix1rgb").textContent = pix1rgb;
+        ID("pix2hex").textContent = pix2hex;
+        ID("pix2rgb").textContent = pix2rgb;
+      }
+
+        ]]>
+    </script>
+  </head>
+  <body onload="load()">
+    <div id="entry">
+      <h1>Reftest analyzer: load raw structured log</h1>
+
+      <p>
+        Either paste your log into this textarea:<br />
+        <textarea cols="80" rows="10" id="logentry" /><br />
+        <input
+          type="button"
+          value="Process pasted log"
+          onclick="log_pasted()"
+        />
+      </p>
+
+      <p>
+        ... or load it from a file:<br />
+        <input type="file" id="fileentry" onchange="fileentry_changed()" />
+      </p>
+    </div>
+
+    <div id="loading" style="display: none">Loading log...</div>
+
+    <div id="viewer" style="display: none">
+      <div id="pixelarea">
+        <div id="pixelinfo">
+          <table>
+            <tbody>
+              <tr>
+                <th>Pixel at:</th>
+                <td colspan="2" id="coords" />
+              </tr>
+              <tr>
+                <th>Image 1:</th>
+                <td id="pix1rgb"></td>
+                <td id="pix1hex"></td>
+              </tr>
+              <tr>
+                <th>Image 2:</th>
+                <td id="pix2rgb"></td>
+                <td id="pix2hex"></td>
+              </tr>
+            </tbody>
+          </table>
           <div>
-            <p>Move the mouse over the reftest image on the right to show
-            magnified pixels on the left.  The color information above is for
-            the pixel centered in the magnified view.</p>
-            <p>Image 1 is shown in the upper triangle of each pixel and Image 2
-            is shown in the lower triangle.</p>
+            <div id="pixelhint">
+              ★
+              <div>
+                <p>
+                  Move the mouse over the reftest image on the right to show
+                  magnified pixels on the left. The color information above is
+                  for the pixel centered in the magnified view.
+                </p>
+                <p>
+                  Image 1 is shown in the upper triangle of each pixel and Image
+                  2 is shown in the lower triangle.
+                </p>
+              </div>
+            </div>
           </div>
         </div>
+        <div id="magnification">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="84"
+            height="84"
+            shape-rendering="optimizeSpeed"
+          >
+            <g id="mag" />
+          </svg>
+        </div>
       </div>
-    </div>
-    <div id="magnification">
-      <svg xmlns="http://www.w3.org/2000/svg" width="84" height="84" shape-rendering="optimizeSpeed">
-        <g id="mag"/>
-      </svg>
-    </div>
-  </div>
-  <div id="itemlist"></div>
-  <div id="images" style="display:none">
-    <form id="imgcontrols">
-    <input id="radio1" type="radio" name="which" value="0" onchange="show_image(1)" checked="checked" /><label id="label1" title="1" for="radio1">Image 1</label>
-    <input id="radio2" type="radio" name="which" value="1" onchange="show_image(2)"                   /><label id="label2" title="2" for="radio2">Image 2</label>
-    <label><input id="differences" type="checkbox" onchange="show_differences(this)" />Circle differences</label>
-    </form>
-    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="1000" id="svg">
-      <defs>
-        <!-- use sRGB to avoid loss of data -->
-        <filter id="showDifferences" x="0%" y="0%" width="100%" height="100%"
-                style="color-interpolation-filters: sRGB">
-          <feImage id="feimage1" result="img1" xlink:href="#image1" />
-          <feImage id="feimage2" result="img2" xlink:href="#image2" />
-          <!-- inv1 and inv2 are the images with RGB inverted -->
-          <feComponentTransfer result="inv1" in="img1">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <feComponentTransfer result="inv2" in="img2">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <!-- w1 will have non-white pixels anywhere that img2
+      <div id="itemlist"></div>
+      <div id="images" style="display: none">
+        <form id="imgcontrols">
+          <input
+            id="radio1"
+            type="radio"
+            name="which"
+            value="0"
+            onchange="show_image(1)"
+            checked="checked"
+          /><label id="label1" title="1" for="radio1">Image 1</label>
+          <input
+            id="radio2"
+            type="radio"
+            name="which"
+            value="1"
+            onchange="show_image(2)"
+          /><label id="label2" title="2" for="radio2">Image 2</label>
+          <label
+            ><input
+              id="differences"
+              type="checkbox"
+              onchange="show_differences(this)"
+            />Circle differences</label
+          >
+        </form>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          version="1.1"
+          width="800"
+          height="1000"
+          id="svg"
+        >
+          <defs>
+            <!-- use sRGB to avoid loss of data -->
+            <filter
+              id="showDifferences"
+              x="0%"
+              y="0%"
+              width="100%"
+              height="100%"
+              style="color-interpolation-filters: sRGB"
+            >
+              <feImage id="feimage1" result="img1" xlink:href="#image1" />
+              <feImage id="feimage2" result="img2" xlink:href="#image2" />
+              <!-- inv1 and inv2 are the images with RGB inverted -->
+              <feComponentTransfer result="inv1" in="img1">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <feComponentTransfer result="inv2" in="img2">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <!-- w1 will have non-white pixels anywhere that img2
                is brighter than img1, and w2 for the reverse.
                It would be nice not to have to go through these
                intermediate states, but feComposite
                type="arithmetic" can't transform the RGB channels
                and leave the alpha channel untouched. -->
-          <feComposite result="w1" in="img1" in2="inv2" operator="arithmetic" k2="1" k3="1" />
-          <feComposite result="w2" in="img2" in2="inv1" operator="arithmetic" k2="1" k3="1" />
-          <!-- c1 will have non-black pixels anywhere that img2
+              <feComposite
+                result="w1"
+                in="img1"
+                in2="inv2"
+                operator="arithmetic"
+                k2="1"
+                k3="1"
+              />
+              <feComposite
+                result="w2"
+                in="img2"
+                in2="inv1"
+                operator="arithmetic"
+                k2="1"
+                k3="1"
+              />
+              <!-- c1 will have non-black pixels anywhere that img2
                is brighter than img1, and c2 for the reverse -->
-          <feComponentTransfer result="c1" in="w1">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <feComponentTransfer result="c2" in="w2">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <!-- c will be nonblack (and fully on) for every pixel+component where there are differences -->
-          <feComposite result="c" in="c1" in2="c2" operator="arithmetic" k2="255" k3="255" />
-          <!-- a will be opaque for every pixel with differences and transparent for all others -->
-          <feColorMatrix result="a" type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  1 1 1 0 0" />
+              <feComponentTransfer result="c1" in="w1">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <feComponentTransfer result="c2" in="w2">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <!-- c will be nonblack (and fully on) for every pixel+component where there are differences -->
+              <feComposite
+                result="c"
+                in="c1"
+                in2="c2"
+                operator="arithmetic"
+                k2="255"
+                k3="255"
+              />
+              <!-- a will be opaque for every pixel with differences and transparent for all others -->
+              <feColorMatrix
+                result="a"
+                type="matrix"
+                values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  1 1 1 0 0"
+              />
 
-          <!-- a, dilated by 1 pixel -->
-          <feMorphology result="dila1" in="a" operator="dilate" radius="1" />
-          <!-- a, dilated by 2 pixels -->
-          <feMorphology result="dila2" in="dila1" operator="dilate" radius="1" />
+              <!-- a, dilated by 1 pixel -->
+              <feMorphology
+                result="dila1"
+                in="a"
+                operator="dilate"
+                radius="1"
+              />
+              <!-- a, dilated by 2 pixels -->
+              <feMorphology
+                result="dila2"
+                in="dila1"
+                operator="dilate"
+                radius="1"
+              />
 
-          <!-- all the pixels in the 2-pixel dilation of a but not in the 1-pixel dilation, to highlight the diffs -->
-          <feComposite result="highlight" in="dila2" in2="dila1" operator="out" />
+              <!-- all the pixels in the 2-pixel dilation of a but not in the 1-pixel dilation, to highlight the diffs -->
+              <feComposite
+                result="highlight"
+                in="dila2"
+                in2="dila1"
+                operator="out"
+              />
 
-          <feFlood result="red" flood-color="red" />
-          <feComposite result="redhighlight" in="red" in2="highlight" operator="in" />
-          <feFlood result="black" flood-color="black" flood-opacity="0.5" />
-          <feMerge>
-            <feMergeNode in="black" />
-            <feMergeNode in="redhighlight" />
-          </feMerge>
-        </filter>
-      </defs>
-      <g onmousemove="magnify(evt)">
-        <image x="0" y="0" width="100%" height="100%" id="image1" />
-        <image x="0" y="0" width="100%" height="100%" id="image2" />
-      </g>
-      <rect id="diffrect" filter="url(#showDifferences)" pointer-events="none" x="0" y="0" width="100%" height="100%" />
-    </svg>
-  </div>
-</div>
-
-</body>
+              <feFlood result="red" flood-color="red" />
+              <feComposite
+                result="redhighlight"
+                in="red"
+                in2="highlight"
+                operator="in"
+              />
+              <feFlood result="black" flood-color="black" flood-opacity="0.5" />
+              <feMerge>
+                <feMergeNode in="black" />
+                <feMergeNode in="redhighlight" />
+              </feMerge>
+            </filter>
+          </defs>
+          <g onmousemove="magnify(evt)">
+            <image x="0" y="0" width="100%" height="100%" id="image1" />
+            <image x="0" y="0" width="100%" height="100%" id="image2" />
+          </g>
+          <rect
+            id="diffrect"
+            filter="url(#showDifferences)"
+            pointer-events="none"
+            x="0"
+            y="0"
+            width="100%"
+            height="100%"
+          />
+        </svg>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/layout/tools/reftest/reftest-analyzer.xhtml b/layout/tools/reftest/reftest-analyzer.xhtml
index 78e250b313ce..ef7ec5384d1d 100644
--- a/layout/tools/reftest/reftest-analyzer.xhtml
+++ b/layout/tools/reftest/reftest-analyzer.xhtml
@@ -20,913 +20,1026 @@ Features to add:
 -->
 <!DOCTYPE html>
 <html lang="en-US" xml:lang="en-US" xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title>Reftest analyzer</title>
-  <style type="text/css"><![CDATA[
+  <head>
+    <title>Reftest analyzer</title>
+    <style type="text/css">
+      <![CDATA[
 
-  html, body { margin: 0; }
-  html { padding: 0; }
-  body { padding: 4px; }
+        html, body { margin: 0; }
+        html { padding: 0; }
+        body { padding: 4px; }
 
-  #pixelarea, #itemlist, #images { position: absolute; }
-  #itemlist, #images { overflow: auto; }
-  #pixelarea { top: 0; left: 0; width: 320px; height: 84px; overflow: visible }
-  #itemlist { top: 84px; left: 0; width: 320px; bottom: 0; }
-  #images { top: 0; bottom: 0; left: 320px; right: 0; }
+        #pixelarea, #itemlist, #images { position: absolute; }
+        #itemlist, #images { overflow: auto; }
+        #pixelarea { top: 0; left: 0; width: 320px; height: 84px; overflow: visible }
+        #itemlist { top: 84px; left: 0; width: 320px; bottom: 0; }
+        #images { top: 0; bottom: 0; left: 320px; right: 0; }
 
-  #leftpane { width: 320px; }
-  #images { position: fixed; top: 10px; left: 340px; }
+        #leftpane { width: 320px; }
+        #images { position: fixed; top: 10px; left: 340px; }
 
-  form#imgcontrols { margin: 0; display: block; }
+        form#imgcontrols { margin: 0; display: block; }
 
-  #itemlist > table { border-collapse: collapse; }
-  #itemlist > table > tbody > tr > td { border: 1px solid; padding: 1px; }
-  #itemlist td.activeitem { background-color: yellow; }
+        #itemlist > table { border-collapse: collapse; }
+        #itemlist > table > tbody > tr > td { border: 1px solid; padding: 1px; }
+        #itemlist td.activeitem { background-color: yellow; }
 
-  /*
-  #itemlist > table > tbody > tr.pass > td.url { background: lime; }
-  #itemlist > table > tbody > tr.fail > td.url { background: red; }
-  */
+        /*
+        #itemlist > table > tbody > tr.pass > td.url { background: lime; }
+        #itemlist > table > tbody > tr.fail > td.url { background: red; }
+        */
 
-  #magnification > svg { display: block; width: 84px; height: 84px; }
+        #magnification > svg { display: block; width: 84px; height: 84px; }
 
-  #pixelinfo { font: small sans-serif; position: absolute; width: 200px; left: 84px; }
-  #pixelinfo table { border-collapse: collapse; }
-  #pixelinfo table th { white-space: nowrap; text-align: left; padding: 0; }
-  #pixelinfo table td { font-family: monospace; padding: 0 0 0 0.25em; }
+        #pixelinfo { font: small sans-serif; position: absolute; width: 200px; left: 84px; }
+        #pixelinfo table { border-collapse: collapse; }
+        #pixelinfo table th { white-space: nowrap; text-align: left; padding: 0; }
+        #pixelinfo table td { font-family: monospace; padding: 0 0 0 0.25em; }
 
-  #pixelhint { display: inline; color: #88f; cursor: help; }
-  #pixelhint > * { display: none; position: absolute; margin: 8px 0 0 8px; padding: 4px; width: 400px; background: #ffa; color: black; box-shadow: 3px 3px 2px #888; z-index: 1; }
-  #pixelhint:hover { color: #000; }
-  #pixelhint:hover > * { display: block; }
-  #pixelhint p { margin: 0; }
-  #pixelhint p + p { margin-top: 1em; }
+        #pixelhint { display: inline; color: #88f; cursor: help; }
+        #pixelhint > * { display: none; position: absolute; margin: 8px 0 0 8px; padding: 4px; width: 400px; background: #ffa; color: black; box-shadow: 3px 3px 2px #888; z-index: 1; }
+        #pixelhint:hover { color: #000; }
+        #pixelhint:hover > * { display: block; }
+        #pixelhint p { margin: 0; }
+        #pixelhint p + p { margin-top: 1em; }
 
-  ]]></style>
-  <script type="text/javascript"><![CDATA[
+        ]]>
+    </style>
+    <script type="text/javascript">
+      <![CDATA[
 
-var XLINK_NS = "http://www.w3.org/1999/xlink";
-var SVG_NS = "http://www.w3.org/2000/svg";
-var IMAGE_NOT_AVAILABLE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAASCAYAAADczdVTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHy0lEQVRoge2aX2hb5xnGf2dYabROgqQkpMuKnWUJLmxHMFaa/SscteQiF5EvUgqLctEVrDJKK1+MolzkQr4IctgW+SLIheJc1BpFpswJw92FbaZsTCGTL0465AtntUekJdJ8lByVHbnnwLsLKbKdSJbiZBVjeuAYn+/P+z3fc97vfd9zbEVEhB566BK+1m0CPfx/o+eAPXQVbR3QqVapOl8FlR46h0O1Wu02iacCZfsasMKEz8vbx1JYE6fY/dXx6mEbFObPcvDVDBlznpc9G+2r8xNcvLqK2w39r4UI+fs7tFjmytgFFu718865EIebPGincI3zFz7Bcrtx97/GL0P+p+IPbSOgRwXtW3vpewqL/a/g5rgf39hit2m0hGUAHOHrrq3trmef4/lDB7Ay57n01zuPZXPX7jUunv+Yf9ktR7D/0CHca7/n3KXPsHbAuynkCWCZptgiImKLaVqP9NuW1bT9ceybpr3j+WJbYrVa3rbEatGZi2uixvWdrysilmWKae2M+5PqlktoosayLfubcrN10dAk24aynUsIxMVsadwUs+EX7dEyAlaXLqMoCj6fj5HkUqO9MD+Govjx+xXcXi+uoRAhvwuv182Z8Ws4AJUlxoZ8uNxuvF43ii/EtdXNNUuV68lR/IqC4gsxPj7KkE/BF5qmClRXrzFSt+/1ulDOjLNU6eQ4OcyPDqH4hhg5O4LicuN2K4xcvk6jjHUKJM8O1fvcKMoZkouFOq1VPp1OcuXGAvrvfsv0lWmSySTzN0sdH+jyYhK/ouB2e/G6XfjPJikBVG8SUhT8fl99nwVGfQp+vx+f4iO5VO1AtwJjfgXF58M/kqSVJP9ef0xuAI6NlwWmL41xxqeg+PyMXr72yBqW3cI4JaZHh1DcXrxeLy5liORiB7q1PiZFyeV0mQqz9TRZeUmFVUGLSjqdkgCIFp2RTCosEJOiiIihSyKWkDl9WYrFnCQCCNF0w0QmHhBQJTEzJ+nZSQmAoEYks2KIGBkJgASiM5I3LbGMnCSCCEQl38GJMvMZiag1e+nlFcmmIgKaZEwREaPGhWGZ1VfEMFZkNj4sgCSyhoihSzwSlqCGoAUlEo1IJByW+Oxyh+dZJJ+eklhiRnIrRcnrM6KCxLOmiNiipyICSGR2pTY2O1m7T2XEsNrrJmJLfjkn6amwoMbFaMEhG28eAVtzExErW3sOBCWVzkpmNiEqCOEZ2RyLTT3eJAKaMhVEUMOSXjHEtg3JTIUFkNTK9rGwbQrWm2xGb6QoWxIqEtdtEWO28aDtoi6JSFCAjUtL1AUzJA4SSW/IZ2VjjU0V0zEBJBiJSzwWk1g8IZEAAmrdidrBkoSKxB4IW08tGVNEzIxoIJM5a8v4SQ1RY5lGSy6x8xScz6QkHFBre1Zre49nH+y1KDEQLV7TcyU1LBCtHVppp9smxk2dYAMtHXA7blZWNJDZ4sZ4MxPbdHjrbc3WNuvOq4YlkYhLLBaXeKx2sLcrBUS2ScFtUbUBh3WgajvgOYgGuKjw4Rsqb1uvkssbWLbJXFQFqL/I9IEKa2WzYcqy16E2BNteB1R+cuwoRwcHGRx4nlfenWMuPclRDx3goSraqd+7Gj/Y5d76SrXLu3VKLYW1rMZbo/QpB4+9zt6fT1I0Law/LRMBaLzC7ePNuSgL7/2GpcotLr7+AZG5t9gH0Fa3zuFq1tiWG4DKs5tebV1NDDW1XYd26iWO9A8wODjAUfUN5ubm+Ch4ZFuuLRzQoVwqUCqXyN9fg3tFSuUShVIZhyr5O2vo94o42DwD/PP23fq8Bf5urLO+BoHBwxzc20c++wcmz+lAkWLFATwcf3+YDwIDhMYmuDw+wt5j5+C5ZwDYP/gSoLP6xX5+fOIkJ47/lIP8g49/Nc3tDj59OZUiRR3uFYsAVO/eZoE1yvkyeA6gAaff+zU3SxUcp8LilQucnoFTP3hhix19/garlQqFW9eZOBti9Mqt9mubXwBw+NALeDC4cfVDzgP3i3keUN/nf4uo+hEver/DRaK84/9mY/72uoFTKVMolVn5/HPgPvlSmVKhRL2bSrlEqVyidH8N/d7t2u/lakfcKneLgM4rvxhncbXA6tI8kTffB+0NjnrAqZYplcrk83ceXdtzgB+psHD7S/pfPs7JkydQB1x8dnWS2SVje9GaxkVLl+DmNNC4NJn/S6JxH5nJyNRwrW7Qi7oMgxBMyd9molvmRKO1cExgshG6l9NTEhkOynAkLlOJoKBuhPV8ZlK0h9aNTqVbv3ltEK/VIiAQEN0yZVLbuM+aImLoEgts3VdsJrfFil1M1/ZSv9RAROaWO8n/hkyF1Q3bgeFGygvPrDRG5Wcf1IJbq9rlNrrNbra96aqlUVMSWrNnNiw5uw23T/4o4Xq7FtA29h2My3K9WtETgRZr13UxdIk+pGswkpCcsX0N2OZD9BOgWqFsgWePp20KWb0ywkDgEIa8y55Gq0O5XKHP7cGz++l/haxWylgOuD17aG7eoVpxwL27RX8b27jZ42n1qdahXKrg2bfnUW0eQ7edoD232l+/LPp2pHvNfh8eT2f8/3sO2AZLyRAvns6gqToLOgxP6Uz87HvdoNJDF9E1B6ysLrLw5yW+3PUNvv3dH/L9wX3doNFDl9E1B+yhB+j9O1YPXcZ/AAl9BWJNvZE7AAAAAElFTkSuQmCC";
+      var XLINK_NS = "http://www.w3.org/1999/xlink";
+      var SVG_NS = "http://www.w3.org/2000/svg";
+      var IMAGE_NOT_AVAILABLE = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAAASCAYAAADczdVTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAHy0lEQVRoge2aX2hb5xnGf2dYabROgqQkpMuKnWUJLmxHMFaa/SscteQiF5EvUgqLctEVrDJKK1+MolzkQr4IctgW+SLIheJc1BpFpswJw92FbaZsTCGTL0465AtntUekJdJ8lByVHbnnwLsLKbKdSJbiZBVjeuAYn+/P+z3fc97vfd9zbEVEhB566BK+1m0CPfx/o+eAPXQVbR3QqVapOl8FlR46h0O1Wu02iacCZfsasMKEz8vbx1JYE6fY/dXx6mEbFObPcvDVDBlznpc9G+2r8xNcvLqK2w39r4UI+fs7tFjmytgFFu718865EIebPGincI3zFz7Bcrtx97/GL0P+p+IPbSOgRwXtW3vpewqL/a/g5rgf39hit2m0hGUAHOHrrq3trmef4/lDB7Ay57n01zuPZXPX7jUunv+Yf9ktR7D/0CHca7/n3KXPsHbAuynkCWCZptgiImKLaVqP9NuW1bT9ceybpr3j+WJbYrVa3rbEatGZi2uixvWdrysilmWKae2M+5PqlktoosayLfubcrN10dAk24aynUsIxMVsadwUs+EX7dEyAlaXLqMoCj6fj5HkUqO9MD+Govjx+xXcXi+uoRAhvwuv182Z8Ws4AJUlxoZ8uNxuvF43ii/EtdXNNUuV68lR/IqC4gsxPj7KkE/BF5qmClRXrzFSt+/1ulDOjLNU6eQ4OcyPDqH4hhg5O4LicuN2K4xcvk6jjHUKJM8O1fvcKMoZkouFOq1VPp1OcuXGAvrvfsv0lWmSySTzN0sdH+jyYhK/ouB2e/G6XfjPJikBVG8SUhT8fl99nwVGfQp+vx+f4iO5VO1AtwJjfgXF58M/kqSVJP9ef0xuAI6NlwWmL41xxqeg+PyMXr72yBqW3cI4JaZHh1DcXrxeLy5liORiB7q1PiZFyeV0mQqz9TRZeUmFVUGLSjqdkgCIFp2RTCosEJOiiIihSyKWkDl9WYrFnCQCCNF0w0QmHhBQJTEzJ+nZSQmAoEYks2KIGBkJgASiM5I3LbGMnCSCCEQl38GJMvMZiag1e+nlFcmmIgKaZEwREaPGhWGZ1VfEMFZkNj4sgCSyhoihSzwSlqCGoAUlEo1IJByW+Oxyh+dZJJ+eklhiRnIrRcnrM6KCxLOmiNiipyICSGR2pTY2O1m7T2XEsNrrJmJLfjkn6amwoMbFaMEhG28eAVtzExErW3sOBCWVzkpmNiEqCOEZ2RyLTT3eJAKaMhVEUMOSXjHEtg3JTIUFkNTK9rGwbQrWm2xGb6QoWxIqEtdtEWO28aDtoi6JSFCAjUtL1AUzJA4SSW/IZ2VjjU0V0zEBJBiJSzwWk1g8IZEAAmrdidrBkoSKxB4IW08tGVNEzIxoIJM5a8v4SQ1RY5lGSy6x8xScz6QkHFBre1Zre49nH+y1KDEQLV7TcyU1LBCtHVppp9smxk2dYAMtHXA7blZWNJDZ4sZ4MxPbdHjrbc3WNuvOq4YlkYhLLBaXeKx2sLcrBUS2ScFtUbUBh3WgajvgOYgGuKjw4Rsqb1uvkssbWLbJXFQFqL/I9IEKa2WzYcqy16E2BNteB1R+cuwoRwcHGRx4nlfenWMuPclRDx3goSraqd+7Gj/Y5d76SrXLu3VKLYW1rMZbo/QpB4+9zt6fT1I0Law/LRMBaLzC7ePNuSgL7/2GpcotLr7+AZG5t9gH0Fa3zuFq1tiWG4DKs5tebV1NDDW1XYd26iWO9A8wODjAUfUN5ubm+Ch4ZFuuLRzQoVwqUCqXyN9fg3tFSuUShVIZhyr5O2vo94o42DwD/PP23fq8Bf5urLO+BoHBwxzc20c++wcmz+lAkWLFATwcf3+YDwIDhMYmuDw+wt5j5+C5ZwDYP/gSoLP6xX5+fOIkJ47/lIP8g49/Nc3tDj59OZUiRR3uFYsAVO/eZoE1yvkyeA6gAaff+zU3SxUcp8LilQucnoFTP3hhix19/garlQqFW9eZOBti9Mqt9mubXwBw+NALeDC4cfVDzgP3i3keUN/nf4uo+hEver/DRaK84/9mY/72uoFTKVMolVn5/HPgPvlSmVKhRL2bSrlEqVyidH8N/d7t2u/lakfcKneLgM4rvxhncbXA6tI8kTffB+0NjnrAqZYplcrk83ceXdtzgB+psHD7S/pfPs7JkydQB1x8dnWS2SVje9GaxkVLl+DmNNC4NJn/S6JxH5nJyNRwrW7Qi7oMgxBMyd9molvmRKO1cExgshG6l9NTEhkOynAkLlOJoKBuhPV8ZlK0h9aNTqVbv3ltEK/VIiAQEN0yZVLbuM+aImLoEgts3VdsJrfFil1M1/ZSv9RAROaWO8n/hkyF1Q3bgeFGygvPrDRG5Wcf1IJbq9rlNrrNbra96aqlUVMSWrNnNiw5uw23T/4o4Xq7FtA29h2My3K9WtETgRZr13UxdIk+pGswkpCcsX0N2OZD9BOgWqFsgWePp20KWb0ywkDgEIa8y55Gq0O5XKHP7cGz++l/haxWylgOuD17aG7eoVpxwL27RX8b27jZ42n1qdahXKrg2bfnUW0eQ7edoD232l+/LPp2pHvNfh8eT2f8/3sO2AZLyRAvns6gqToLOgxP6Uz87HvdoNJDF9E1B6ysLrLw5yW+3PUNvv3dH/L9wX3doNFDl9E1B+yhB+j9O1YPXcZ/AAl9BWJNvZE7AAAAAElFTkSuQmCC";
 
-var gPhases = null;
+      var gPhases = null;
 
-var gIDCache = {};
+      var gIDCache = {};
 
-var gMagPixPaths = [];     // 2D array of array-of-two <path> objects used in the pixel magnifier
-var gMagWidth = 5;         // number of zoomed in pixels to show horizontally
-var gMagHeight = 5;        // number of zoomed in pixels to show vertically
-var gMagZoom = 16;         // size of the zoomed in pixels
-var gImage1Data;           // ImageData object for the reference image
-var gImage2Data;           // ImageData object for the test output image
-var gFlashingPixels = [];  // array of <path> objects that should be flashed due to pixel color mismatch
-var gParams;
+      var gMagPixPaths = [];     // 2D array of array-of-two <path> objects used in the pixel magnifier
+      var gMagWidth = 5;         // number of zoomed in pixels to show horizontally
+      var gMagHeight = 5;        // number of zoomed in pixels to show vertically
+      var gMagZoom = 16;         // size of the zoomed in pixels
+      var gImage1Data;           // ImageData object for the reference image
+      var gImage2Data;           // ImageData object for the test output image
+      var gFlashingPixels = [];  // array of <path> objects that should be flashed due to pixel color mismatch
+      var gParams;
 
-function ID(id) {
-  if (!(id in gIDCache))
-    gIDCache[id] = document.getElementById(id);
-  return gIDCache[id];
-}
-
-function hash_parameters() {
-  var result = { };
-  var params = window.location.hash.substr(1).split(/[&;]/);
-  for (var i = 0; i < params.length; i++) {
-    var parts = params[i].split("=");
-    result[parts[0]] = unescape(unescape(parts[1]));
-  }
-  return result;
-}
-
-function load() {
-  gPhases = [ ID("entry"), ID("loading"), ID("viewer") ];
-  build_mag();
-  gParams = hash_parameters();
-  if (gParams.log) {
-    show_phase("loading");
-    process_log(gParams.log);
-  } else if (gParams.logurl) {
-    show_phase("loading");
-    var req = new XMLHttpRequest();
-    req.onreadystatechange = function() {
-      if (req.readyState === 4) {
-        process_log(req.responseText);
+      function ID(id) {
+        if (!(id in gIDCache))
+          gIDCache[id] = document.getElementById(id);
+        return gIDCache[id];
       }
-    };
-    req.open('GET', gParams.logurl, true);
-    req.send();
-  }
-  window.addEventListener('keypress', handle_keyboard_shortcut);
-  window.addEventListener('keydown',  handle_keydown);
-  ID("image1").addEventListener('error', image_load_error);
-  ID("image2").addEventListener('error', image_load_error);
-}
 
-function image_load_error(e) {
-  e.target.setAttributeNS(XLINK_NS, "xlink:href", IMAGE_NOT_AVAILABLE);
-}
+      function hash_parameters() {
+        var result = { };
+        var params = window.location.hash.substr(1).split(/[&;]/);
+        for (var i = 0; i < params.length; i++) {
+          var parts = params[i].split("=");
+          result[parts[0]] = unescape(unescape(parts[1]));
+        }
+        return result;
+      }
 
-function build_mag() {
-  var mag = ID("mag");
+      function load() {
+        gPhases = [ ID("entry"), ID("loading"), ID("viewer") ];
+        build_mag();
+        gParams = hash_parameters();
+        if (gParams.log) {
+          show_phase("loading");
+          process_log(gParams.log);
+        } else if (gParams.logurl) {
+          show_phase("loading");
+          var req = new XMLHttpRequest();
+          req.onreadystatechange = function() {
+            if (req.readyState === 4) {
+              process_log(req.responseText);
+            }
+          };
+          req.open('GET', gParams.logurl, true);
+          req.send();
+        }
+        window.addEventListener('keypress', handle_keyboard_shortcut);
+        window.addEventListener('keydown',  handle_keydown);
+        ID("image1").addEventListener('error', image_load_error);
+        ID("image2").addEventListener('error', image_load_error);
+      }
 
-  var r = document.createElementNS(SVG_NS, "rect");
-  r.setAttribute("x", gMagZoom * -gMagWidth / 2);
-  r.setAttribute("y", gMagZoom * -gMagHeight / 2);
-  r.setAttribute("width", gMagZoom * gMagWidth);
-  r.setAttribute("height", gMagZoom * gMagHeight);
-  mag.appendChild(r);
+      function image_load_error(e) {
+        e.target.setAttributeNS(XLINK_NS, "xlink:href", IMAGE_NOT_AVAILABLE);
+      }
 
-  mag.setAttribute("transform", "translate(" + (gMagZoom * (gMagWidth / 2) + 1) + "," + (gMagZoom * (gMagHeight / 2) + 1) + ")");
+      function build_mag() {
+        var mag = ID("mag");
 
-  for (var x = 0; x < gMagWidth; x++) {
-    gMagPixPaths[x] = [];
-    for (var y = 0; y < gMagHeight; y++) {
-      var p1 = document.createElementNS(SVG_NS, "path");
-      p1.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "h" + -gMagZoom + "v" + gMagZoom);
-      p1.setAttribute("stroke", "black");
-      p1.setAttribute("stroke-width", "1px");
-      p1.setAttribute("fill", "#aaa");
+        var r = document.createElementNS(SVG_NS, "rect");
+        r.setAttribute("x", gMagZoom * -gMagWidth / 2);
+        r.setAttribute("y", gMagZoom * -gMagHeight / 2);
+        r.setAttribute("width", gMagZoom * gMagWidth);
+        r.setAttribute("height", gMagZoom * gMagHeight);
+        mag.appendChild(r);
 
-      var p2 = document.createElementNS(SVG_NS, "path");
-      p2.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "v" + gMagZoom + "h" + -gMagZoom);
-      p2.setAttribute("stroke", "black");
-      p2.setAttribute("stroke-width", "1px");
-      p2.setAttribute("fill", "#888");
+        mag.setAttribute("transform", "translate(" + (gMagZoom * (gMagWidth / 2) + 1) + "," + (gMagZoom * (gMagHeight / 2) + 1) + ")");
 
-      mag.appendChild(p1);
-      mag.appendChild(p2);
-      gMagPixPaths[x][y] = [p1, p2];
-    }
-  }
+        for (var x = 0; x < gMagWidth; x++) {
+          gMagPixPaths[x] = [];
+          for (var y = 0; y < gMagHeight; y++) {
+            var p1 = document.createElementNS(SVG_NS, "path");
+            p1.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "h" + -gMagZoom + "v" + gMagZoom);
+            p1.setAttribute("stroke", "black");
+            p1.setAttribute("stroke-width", "1px");
+            p1.setAttribute("fill", "#aaa");
 
-  var flashedOn = false;
-  setInterval(function() {
-    flashedOn = !flashedOn;
-    flash_pixels(flashedOn);
-  }, 500);
-}
+            var p2 = document.createElementNS(SVG_NS, "path");
+            p2.setAttribute("d", "M" + ((x - gMagWidth / 2) + 1) * gMagZoom + "," + (y - gMagHeight / 2) * gMagZoom + "v" + gMagZoom + "h" + -gMagZoom);
+            p2.setAttribute("stroke", "black");
+            p2.setAttribute("stroke-width", "1px");
+            p2.setAttribute("fill", "#888");
 
-function show_phase(phaseid) {
-  for (var i in gPhases) {
-    var phase = gPhases[i];
-    phase.style.display = (phase.id == phaseid) ? "" : "none";
-  }
+            mag.appendChild(p1);
+            mag.appendChild(p2);
+            gMagPixPaths[x][y] = [p1, p2];
+          }
+        }
 
-  if (phase == "viewer")
-    ID("images").style.display = "none";
-}
+        var flashedOn = false;
+        setInterval(function() {
+          flashedOn = !flashedOn;
+          flash_pixels(flashedOn);
+        }, 500);
+      }
 
-function fileentry_changed() {
-  show_phase("loading");
-  var input = ID("fileentry");
-  var files = input.files;
-  if (files.length > 0) {
-    // Only handle the first file; don't handle multiple selection.
-    // The parts of the log we care about are ASCII-only.  Since we
-    // can ignore lines we don't care about, best to read in as
-    // iso-8859-1, which guarantees we don't get decoding errors.
-    var fileReader = new FileReader();
-    fileReader.onload = function(e) {
-      var log = null;
+      function show_phase(phaseid) {
+        for (var i in gPhases) {
+          var phase = gPhases[i];
+          phase.style.display = (phase.id == phaseid) ? "" : "none";
+        }
 
-      log = e.target.result;
+        if (phase == "viewer")
+          ID("images").style.display = "none";
+      }
 
-      if (log)
+      function fileentry_changed() {
+        show_phase("loading");
+        var input = ID("fileentry");
+        var files = input.files;
+        if (files.length > 0) {
+          // Only handle the first file; don't handle multiple selection.
+          // The parts of the log we care about are ASCII-only.  Since we
+          // can ignore lines we don't care about, best to read in as
+          // iso-8859-1, which guarantees we don't get decoding errors.
+          var fileReader = new FileReader();
+          fileReader.onload = function(e) {
+            var log = null;
+
+            log = e.target.result;
+
+            if (log)
+              process_log(log);
+            else
+              show_phase("entry");
+          }
+          fileReader.readAsText(files[0], "iso-8859-1");
+        }
+        // So the user can process the same filename again (after
+        // overwriting the log), clear the value on the form input so we
+        // will always get an onchange event.
+        input.value = "";
+      }
+
+      function log_pasted() {
+        show_phase("loading");
+        var entry = ID("logentry");
+        var log = entry.value;
+        entry.value = "";
         process_log(log);
-      else
-        show_phase("entry");
-    }
-    fileReader.readAsText(files[0], "iso-8859-1");
-  }
-  // So the user can process the same filename again (after
-  // overwriting the log), clear the value on the form input so we
-  // will always get an onchange event.
-  input.value = "";
-}
+      }
 
-function log_pasted() {
-  show_phase("loading");
-  var entry = ID("logentry");
-  var log = entry.value;
-  entry.value = "";
-  process_log(log);
-}
+      var gTestItems;
 
-var gTestItems;
+      // This function is not used in production code, but can be invoked manually
+      // from the devtools console in order to test changes to the parsing regexes
+      // in process_log.
+      function test_parsing() {
+        // Note that the logs in these testcases have been manually edited to strip
+        // out stuff for brevity.
+        var testcases = [
+          { "name": "empty log",
+            "log": "",
+            "expected": { "pass": 0, "unexpected": 0, "random": 0, "skip": 0 },
+            "expected_images": 0,
+          },
+          { "name": "android log",
+            "log": `[task 2018-12-28T10:36:45.718Z] 10:36:45     INFO -  REFTEST TEST-START | a == b
+      [task 2018-12-28T10:36:45.719Z] 10:36:45     INFO -  REFTEST TEST-LOAD | a | 78 / 275 (28%)
+      [task 2018-12-28T10:36:56.138Z] 10:36:56     INFO -  REFTEST TEST-LOAD | b | 78 / 275 (28%)
+      [task 2018-12-28T10:37:06.559Z] 10:37:06     INFO -  REFTEST TEST-UNEXPECTED-FAIL | a == b | image comparison, max difference: 255, number of differing pixels: 5950
+      [task 2018-12-28T10:37:06.568Z] 10:37:06     INFO -  REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+      [task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+      [task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST INFO | Saved log: stuff trimmed here
+      [task 2018-12-28T10:37:06.582Z] 10:37:06     INFO -  REFTEST TEST-END | a == b
+      [task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-START | a2 == b2
+      [task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-LOAD | a2 | 79 / 275 (28%)
+      [task 2018-12-28T10:37:06.584Z] 10:37:06     INFO -  REFTEST TEST-LOAD | b2 | 79 / 275 (28%)
+      [task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-PASS | a2 == b2 | image comparison, max difference: 0, number of differing pixels: 0
+      [task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-END | a2 == b2`,
+            "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "local reftest run (Linux)",
+            "log": `REFTEST TEST-START | file:///a == file:///b
+      REFTEST TEST-LOAD | file:///a | 73 / 86 (84%)
+      REFTEST TEST-LOAD | file:///b | 73 / 86 (84%)
+      REFTEST TEST-PASS | file:///a == file:///b | image comparison, max difference: 0, number of differing pixels: 0
+      REFTEST TEST-END | file:///a == file:///b`,
+            "expected": { "pass": 1, "unexpected": 0, "random": 0, "skip": 0 },
+            "expected_images": 0,
+          },
+          { "name": "wpt reftests (Linux automation)",
+            "log": `16:50:43     INFO - TEST-START | /a
+      16:50:43     INFO - PID 4276 | 1548694243694	Marionette	INFO	Testing http://web-platform.test:8000/a == http://web-platform.test:8000/b
+      16:50:43     INFO - PID 4276 | 1548694243963	Marionette	INFO	No differences allowed
+      16:50:44     INFO - TEST-PASS | /a | took 370ms
+      16:50:44     INFO - TEST-START | /a2
+      16:50:44     INFO - PID 4276 | 1548694244066	Marionette	INFO	Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
+      16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	No differences allowed
+      16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	Found 28 pixels different, maximum difference per channel 14
+      16:50:44     INFO - TEST-UNEXPECTED-FAIL | /a2 | Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
+      16:50:44     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+      16:50:44     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+      16:50:44     INFO - TEST-INFO took 840ms`,
+            "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "windows log",
+            "log": `12:17:14     INFO - REFTEST TEST-START | a == b
+      12:17:14     INFO - REFTEST TEST-LOAD | a | 1603 / 2053 (78%)
+      12:17:14     INFO - REFTEST TEST-LOAD | b | 1603 / 2053 (78%)
+      12:17:14     INFO - REFTEST TEST-PASS(EXPECTED RANDOM) | a == b | image comparison, max difference: 0, number of differing pixels: 0
+      12:17:14     INFO - REFTEST TEST-END | a == b
+      12:17:14     INFO - REFTEST TEST-START | a2 == b2
+      12:17:14     INFO - REFTEST TEST-LOAD | a2 | 1604 / 2053 (78%)
+      12:17:14     INFO - REFTEST TEST-LOAD | b2 | 1604 / 2053 (78%)
+      12:17:14     INFO - REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 9976
+      12:17:14     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+      12:17:14     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+      12:17:14     INFO - REFTEST INFO | Saved log: stuff trimmed here
+      12:17:14     INFO - REFTEST TEST-END | a2 == b2
+      12:01:09     INFO - REFTEST TEST-START | a3 == b3
+      12:01:09     INFO - REFTEST TEST-LOAD | a3 | 66 / 189 (34%)
+      12:01:09     INFO - REFTEST TEST-LOAD | b3 | 66 / 189 (34%)
+      12:01:09     INFO - REFTEST TEST-KNOWN-FAIL | a3 == b3 | image comparison, max difference: 255, number of differing pixels: 9654
+      12:01:09     INFO - REFTEST TEST-END | a3 == b3`,
+            "expected": { "pass": 1, "unexpected": 1, "random": 1, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "webrender wrench log (windows)",
+            "log": `[task 2018-12-29T04:29:48.800Z] REFTEST a == b
+      [task 2018-12-29T04:29:48.984Z] REFTEST a2 == b2
+      [task 2018-12-29T04:29:49.053Z] REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 3128
+      [task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 1 (TEST): data:image/png;
+      [task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 2 (REFERENCE): data:image/png;
+      [task 2018-12-29T04:29:49.053Z] REFTEST TEST-END | a2 == b2`,
+            "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "wpt reftests (Linux local; Bug 1530008)",
+            "log": `SUITE-START | Running 1 tests
+      TEST-START | /css/css-backgrounds/border-image-6.html
+      TEST-UNEXPECTED-FAIL | /css/css-backgrounds/border-image-6.html | Testing http://web-platform.test:8000/css/css-backgrounds/border-image-6.html == http://web-platform.test:8000/css/css-backgrounds/border-image-6-ref.html
+      REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+      REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+      TEST-INFO took 425ms
+      SUITE-END | took 2s`,
+            "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "wpt reftests (taskcluster log from macOS CI)",
+            "log": `[task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
+      [task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - PID 1353 | 1593135329040    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
+      [task 2020-06-26T01:35:29.673Z] 01:35:29     INFO - PID 1353 | 1593135329633    Marionette  INFO    No differences allowed
+      [task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - TEST-KNOWN-INTERMITTENT-FAIL | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 649ms
+      [task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
+      [task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
+            "expected": { "pass": 0, "unexpected": 0, "random": 1, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "wpt reftests (taskcluster log from Windows CI)",
+            "log": `[task 2020-06-26T01:41:19.205Z] 01:41:19     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
+      [task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 5920 | 1593135679202    Marionette  WARN    [24] http://web-platform.test:8000/css/WOFF2/metadatadisplay-schema-license-022-ref.xht overflows viewport (width: 783, height: 731)
+      [task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 9692 | 1593135679208    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
+      [task 2020-06-26T01:41:19.638Z] 01:41:19     INFO - PID 9692 | 1593135679627    Marionette  INFO    No differences allowed
+      [task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - TEST-KNOWN-INTERMITTENT-PASS | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 474ms
+      [task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
+      [task 2020-06-26T01:41:19.689Z] 01:41:19     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
+            "expected": { "pass": 1, "unexpected": 0, "random": 1, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "local reftest run with timestamps (Linux; Bug 1167712)",
+            "log": ` 0:05.21 REFTEST TEST-START | a
+       0:05.21 REFTEST REFTEST TEST-LOAD | a | 0 / 1 (0%)
+       0:05.27 REFTEST REFTEST TEST-LOAD | b | 0 / 1 (0%)
+       0:05.66 REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
+       0:05.67 REFTEST REFTEST   IMAGE 1 (TEST): data:image/png;base64,
+       0:05.67 REFTEST REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
+       0:05.73 REFTEST REFTEST TEST-END | a`,
+            "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+          { "name": "reftest run with whitespace compressed (Treeherder; Bug 1084322)",
+            "log": ` REFTEST TEST-START | a
+      REFTEST TEST-LOAD | a | 0 / 1 (0%)
+      REFTEST TEST-LOAD | b | 0 / 1 (0%)
+      REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
+      REFTEST REFTEST IMAGE 1 (TEST): data:image/png;base64,
+      REFTEST REFTEST IMAGE 2 (REFERENCE): data:image/png;base64,
+      REFTEST REFTEST TEST-END | a`,
+            "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
+            "expected_images": 2,
+          },
+        ];
 
-// This function is not used in production code, but can be invoked manually
-// from the devtools console in order to test changes to the parsing regexes
-// in process_log.
-function test_parsing() {
-  // Note that the logs in these testcases have been manually edited to strip
-  // out stuff for brevity.
-  var testcases = [
-    { "name": "empty log",
-      "log": "",
-      "expected": { "pass": 0, "unexpected": 0, "random": 0, "skip": 0 },
-      "expected_images": 0,
-    },
-    { "name": "android log",
-      "log": `[task 2018-12-28T10:36:45.718Z] 10:36:45     INFO -  REFTEST TEST-START | a == b
-[task 2018-12-28T10:36:45.719Z] 10:36:45     INFO -  REFTEST TEST-LOAD | a | 78 / 275 (28%)
-[task 2018-12-28T10:36:56.138Z] 10:36:56     INFO -  REFTEST TEST-LOAD | b | 78 / 275 (28%)
-[task 2018-12-28T10:37:06.559Z] 10:37:06     INFO -  REFTEST TEST-UNEXPECTED-FAIL | a == b | image comparison, max difference: 255, number of differing pixels: 5950
-[task 2018-12-28T10:37:06.568Z] 10:37:06     INFO -  REFTEST   IMAGE 1 (TEST): data:image/png;base64,
-[task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
-[task 2018-12-28T10:37:06.577Z] 10:37:06     INFO -  REFTEST INFO | Saved log: stuff trimmed here
-[task 2018-12-28T10:37:06.582Z] 10:37:06     INFO -  REFTEST TEST-END | a == b
-[task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-START | a2 == b2
-[task 2018-12-28T10:37:06.583Z] 10:37:06     INFO -  REFTEST TEST-LOAD | a2 | 79 / 275 (28%)
-[task 2018-12-28T10:37:06.584Z] 10:37:06     INFO -  REFTEST TEST-LOAD | b2 | 79 / 275 (28%)
-[task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-PASS | a2 == b2 | image comparison, max difference: 0, number of differing pixels: 0
-[task 2018-12-28T10:37:16.982Z] 10:37:16     INFO -  REFTEST TEST-END | a2 == b2`,
-      "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "local reftest run (Linux)",
-      "log": `REFTEST TEST-START | file:///a == file:///b
-REFTEST TEST-LOAD | file:///a | 73 / 86 (84%)
-REFTEST TEST-LOAD | file:///b | 73 / 86 (84%)
-REFTEST TEST-PASS | file:///a == file:///b | image comparison, max difference: 0, number of differing pixels: 0
-REFTEST TEST-END | file:///a == file:///b`,
-      "expected": { "pass": 1, "unexpected": 0, "random": 0, "skip": 0 },
-      "expected_images": 0,
-    },
-    { "name": "wpt reftests (Linux automation)",
-      "log": `16:50:43     INFO - TEST-START | /a
-16:50:43     INFO - PID 4276 | 1548694243694	Marionette	INFO	Testing http://web-platform.test:8000/a == http://web-platform.test:8000/b
-16:50:43     INFO - PID 4276 | 1548694243963	Marionette	INFO	No differences allowed
-16:50:44     INFO - TEST-PASS | /a | took 370ms
-16:50:44     INFO - TEST-START | /a2
-16:50:44     INFO - PID 4276 | 1548694244066	Marionette	INFO	Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
-16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	No differences allowed
-16:50:44     INFO - PID 4276 | 1548694244792	Marionette	INFO	Found 28 pixels different, maximum difference per channel 14
-16:50:44     INFO - TEST-UNEXPECTED-FAIL | /a2 | Testing http://web-platform.test:8000/a2 == http://web-platform.test:8000/b2
-16:50:44     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
-16:50:44     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
-16:50:44     INFO - TEST-INFO took 840ms`,
-      "expected": { "pass": 1, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "windows log",
-      "log": `12:17:14     INFO - REFTEST TEST-START | a == b
-12:17:14     INFO - REFTEST TEST-LOAD | a | 1603 / 2053 (78%)
-12:17:14     INFO - REFTEST TEST-LOAD | b | 1603 / 2053 (78%)
-12:17:14     INFO - REFTEST TEST-PASS(EXPECTED RANDOM) | a == b | image comparison, max difference: 0, number of differing pixels: 0
-12:17:14     INFO - REFTEST TEST-END | a == b
-12:17:14     INFO - REFTEST TEST-START | a2 == b2
-12:17:14     INFO - REFTEST TEST-LOAD | a2 | 1604 / 2053 (78%)
-12:17:14     INFO - REFTEST TEST-LOAD | b2 | 1604 / 2053 (78%)
-12:17:14     INFO - REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 9976
-12:17:14     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;base64,
-12:17:14     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
-12:17:14     INFO - REFTEST INFO | Saved log: stuff trimmed here
-12:17:14     INFO - REFTEST TEST-END | a2 == b2
-12:01:09     INFO - REFTEST TEST-START | a3 == b3
-12:01:09     INFO - REFTEST TEST-LOAD | a3 | 66 / 189 (34%)
-12:01:09     INFO - REFTEST TEST-LOAD | b3 | 66 / 189 (34%)
-12:01:09     INFO - REFTEST TEST-KNOWN-FAIL | a3 == b3 | image comparison, max difference: 255, number of differing pixels: 9654
-12:01:09     INFO - REFTEST TEST-END | a3 == b3`,
-      "expected": { "pass": 1, "unexpected": 1, "random": 1, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "webrender wrench log (windows)",
-      "log": `[task 2018-12-29T04:29:48.800Z] REFTEST a == b
-[task 2018-12-29T04:29:48.984Z] REFTEST a2 == b2
-[task 2018-12-29T04:29:49.053Z] REFTEST TEST-UNEXPECTED-FAIL | a2 == b2 | image comparison, max difference: 255, number of differing pixels: 3128
-[task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 1 (TEST): data:image/png;
-[task 2018-12-29T04:29:49.053Z] REFTEST   IMAGE 2 (REFERENCE): data:image/png;
-[task 2018-12-29T04:29:49.053Z] REFTEST TEST-END | a2 == b2`,
-      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "wpt reftests (Linux local; Bug 1530008)",
-      "log": `SUITE-START | Running 1 tests
-TEST-START | /css/css-backgrounds/border-image-6.html
-TEST-UNEXPECTED-FAIL | /css/css-backgrounds/border-image-6.html | Testing http://web-platform.test:8000/css/css-backgrounds/border-image-6.html == http://web-platform.test:8000/css/css-backgrounds/border-image-6-ref.html
-REFTEST   IMAGE 1 (TEST): data:image/png;base64,
-REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
-TEST-INFO took 425ms
-SUITE-END | took 2s`,
-      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "wpt reftests (taskcluster log from macOS CI)",
-      "log": `[task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
-[task 2020-06-26T01:35:29.065Z] 01:35:29     INFO - PID 1353 | 1593135329040    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
-[task 2020-06-26T01:35:29.673Z] 01:35:29     INFO - PID 1353 | 1593135329633    Marionette  INFO    No differences allowed
-[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - TEST-KNOWN-INTERMITTENT-FAIL | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 649ms
-[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
-[task 2020-06-26T01:35:29.726Z] 01:35:29     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
-      "expected": { "pass": 0, "unexpected": 0, "random": 1, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "wpt reftests (taskcluster log from Windows CI)",
-      "log": `[task 2020-06-26T01:41:19.205Z] 01:41:19     INFO - TEST-START | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html
-[task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 5920 | 1593135679202    Marionette  WARN    [24] http://web-platform.test:8000/css/WOFF2/metadatadisplay-schema-license-022-ref.xht overflows viewport (width: 783, height: 731)
-[task 2020-06-26T01:41:19.214Z] 01:41:19     INFO - PID 9692 | 1593135679208    Marionette  INFO    Testing http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html == http://web-platform.test:8000/html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values-ref.html
-[task 2020-06-26T01:41:19.638Z] 01:41:19     INFO - PID 9692 | 1593135679627    Marionette  INFO    No differences allowed
-[task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - TEST-KNOWN-INTERMITTENT-PASS | /html/rendering/non-replaced-elements/the-page/iframe-scrolling-attribute-values.html | took 474ms
-[task 2020-06-26T01:41:19.688Z] 01:41:19     INFO - REFTEST   IMAGE 1 (TEST): data:image/png;
-[task 2020-06-26T01:41:19.689Z] 01:41:19     INFO - REFTEST   IMAGE 2 (REFERENCE): data:image/png;`,
-      "expected": { "pass": 1, "unexpected": 0, "random": 1, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "local reftest run with timestamps (Linux; Bug 1167712)",
-      "log": ` 0:05.21 REFTEST TEST-START | a
- 0:05.21 REFTEST REFTEST TEST-LOAD | a | 0 / 1 (0%)
- 0:05.27 REFTEST REFTEST TEST-LOAD | b | 0 / 1 (0%)
- 0:05.66 REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
- 0:05.67 REFTEST REFTEST   IMAGE 1 (TEST): data:image/png;base64,
- 0:05.67 REFTEST REFTEST   IMAGE 2 (REFERENCE): data:image/png;base64,
- 0:05.73 REFTEST REFTEST TEST-END | a`,
-      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-    { "name": "reftest run with whitespace compressed (Treeherder; Bug 1084322)",
-      "log": ` REFTEST TEST-START | a
-REFTEST TEST-LOAD | a | 0 / 1 (0%)
-REFTEST TEST-LOAD | b | 0 / 1 (0%)
-REFTEST TEST-UNEXPECTED-FAIL | a | image comparison (==), max difference: 106, number of differing pixels: 800
-REFTEST REFTEST IMAGE 1 (TEST): data:image/png;base64,
-REFTEST REFTEST IMAGE 2 (REFERENCE): data:image/png;base64,
-REFTEST REFTEST TEST-END | a`,
-      "expected": { "pass": 0, "unexpected": 1, "random": 0, "skip": 0 },
-      "expected_images": 2,
-    },
-  ];
+        var current_test = 0;
 
-  var current_test = 0;
+        // Override the build_viewer function invoked at the end of process_log to
+        // actually just check the results of parsing.
+        build_viewer = function() {
+          var expected = testcases[current_test].expected;
+          var expected_images = testcases[current_test].expected_images;
+          for (var result of gTestItems) {
+            for (let type in expected) { // type is "pass", "unexpected" etc.
+              if (result[type]) {
+                expected[type]--;
+              }
+            }
+          }
+          var failed = false;
+          for (let type in expected) {
+            if (expected[type] != 0) {
+              console.log(`Failure: for testcase ${testcases[current_test].name} got ${expected[type]} fewer ${type} results than expected!`);
+              failed = true;
+            }
+          }
 
-  // Override the build_viewer function invoked at the end of process_log to
-  // actually just check the results of parsing.
-  build_viewer = function() {
-    var expected = testcases[current_test].expected;
-    var expected_images = testcases[current_test].expected_images;
-    for (var result of gTestItems) {
-      for (let type in expected) { // type is "pass", "unexpected" etc.
-        if (result[type]) {
-          expected[type]--;
+          let total_images = 0;
+          for (var result of gTestItems) {
+            total_images += result.images.length;
+          }
+          if (total_images !== expected_images) {
+            console.log(`Failure: for testcase ${testcases[current_test].name} got ${total_images} images, expected ${expected_images}`);
+            failed = true;
+          }
+
+          if (!failed) {
+            console.log(`Success for testcase ${testcases[current_test].name}`);
+          }
+        };
+
+        while (current_test < testcases.length) {
+          process_log(testcases[current_test].log);
+          current_test++;
         }
       }
-    }
-    var failed = false;
-    for (let type in expected) {
-      if (expected[type] != 0) {
-        console.log(`Failure: for testcase ${testcases[current_test].name} got ${expected[type]} fewer ${type} results than expected!`);
-        failed = true;
-      }
-    }
 
-    let total_images = 0;
-    for (var result of gTestItems) {
-      total_images += result.images.length;
-    }
-    if (total_images !== expected_images) {
-      console.log(`Failure: for testcase ${testcases[current_test].name} got ${total_images} images, expected ${expected_images}`);
-      failed = true;
-    }
+      function process_log(contents) {
+        var lines = contents.split(/[\r\n]+/);
+        gTestItems = [];
+        for (var j in lines) {
 
-    if (!failed) {
-      console.log(`Success for testcase ${testcases[current_test].name}`);
-    }
-  };
+          // !!!!!!
+          // When making any changes to this code, please add a test to the
+          // test_parsing function above, and ensure all existing tests pass.
+          // !!!!!!
 
-  while (current_test < testcases.length) {
-    process_log(testcases[current_test].log);
-    current_test++;
-  }
-}
-
-function process_log(contents) {
-  var lines = contents.split(/[\r\n]+/);
-  gTestItems = [];
-  for (var j in lines) {
-
-    // !!!!!!
-    // When making any changes to this code, please add a test to the
-    // test_parsing function above, and ensure all existing tests pass.
-    // !!!!!!
-
-    var line = lines[j];
-    // Ignore duplicated output in logcat.
-    if (line.match(/I\/Gecko.*?REFTEST/))
-      continue;
-    var match = line.match(/^.*?(?:REFTEST\s+)+(.*)$/);
-    if (!match) {
-      // WPT reftests don't always have the "REFTEST" prefix but do have
-      // mozharness prefixing. Trying to match both prefixes optionally with a
-      // single regex either makes an unreadable mess or matches everything so
-      // we do them separately.
-      match = line.match(/^(?:.*? (?:INFO|ERROR) -\s+)(.*)$/);
-    }
-    if (match)
-      line = match[1];
-    match = line.match(/^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-FAIL|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL|TEST-DEBUG-INFO|TEST-KNOWN-INTERMITTENT-FAIL|TEST-KNOWN-INTERMITTENT-PASS)(\(EXPECTED RANDOM\)|) \| ([^\|]+)(?: \|(.*)|$)/);
-    if (match) {
-      var state = match[1];
-      var random = match[2];
-      var url = match[3];
-      var extra = match[4];
-      gTestItems.push(
-        {
-          pass: !state.match(/DEBUG-INFO$|FAIL$/),
-          // only one of the following three should ever be true
-          unexpected: !!state.match(/^TEST-UNEXPECTED/),
-          random: (random == "(EXPECTED RANDOM)" || state == "TEST-KNOWN-INTERMITTENT-FAIL" || state == "TEST-KNOWN-INTERMITTENT-PASS"),
-          skip: (extra == " (SKIP)"),
-          url: url,
-          images: [],
-          imageLabels: []
-        });
-      continue;
-    }
-    match = line.match(/^IMAGE([^:]*): (data:.*)$/);
-    if (match) {
-      var item = gTestItems[gTestItems.length - 1];
-      item.images.push(match[2]);
-      item.imageLabels.push(match[1]);
-    }
-  }
-
-  build_viewer();
-}
-
-function build_viewer() {
-  if (gTestItems.length == 0) {
-    show_phase("entry");
-    return;
-  }
-
-  var cell = ID("itemlist");
-  while (cell.childNodes.length > 0)
-    cell.removeChild(cell.childNodes[cell.childNodes.length - 1]);
-
-  var table = document.createElement("table");
-  var tbody = document.createElement("tbody");
-  table.appendChild(tbody);
-
-  for (var i in gTestItems) {
-    var item = gTestItems[i];
-
-    // optional url filter for only showing unexpected results
-    if (parseInt(gParams.only_show_unexpected) && !item.unexpected)
-      continue;
-
-    // XXX regardless skip expected pass items until we have filtering UI
-    if (item.pass && !item.unexpected)
-      continue;
-
-    var tr = document.createElement("tr");
-    var rowclass = item.pass ? "pass" : "fail";
-    var td;
-    var text;
-
-    td = document.createElement("td");
-    text = "";
-    if (item.unexpected) { text += "!"; rowclass += " unexpected"; }
-    if (item.random) { text += "R"; rowclass += " random"; }
-    if (item.skip) { text += "S"; rowclass += " skip"; }
-    td.appendChild(document.createTextNode(text));
-    tr.appendChild(td);
-
-    td = document.createElement("td");
-    td.id = "item" + i;
-    td.className = "url";
-    // Only display part of URL after "/mozilla/".
-    var match = item.url.match(/\/mozilla\/(.*)/);
-    text = document.createTextNode(match ? match[1] : item.url);
-    if (item.images.length > 0) {
-      var a = document.createElement("a");
-      a.href = "javascript:show_images(" + i + ")";
-      a.appendChild(text);
-      td.appendChild(a);
-    } else {
-      td.appendChild(text);
-    }
-    tr.appendChild(td);
-
-    tbody.appendChild(tr);
-  }
-
-  cell.appendChild(table);
-
-  show_phase("viewer");
-}
-
-function get_image_data(src, whenReady) {
-  var img = new Image();
-  img.onload = function() {
-    var canvas = document.createElement("canvas");
-    canvas.width = img.naturalWidth;
-    canvas.height = img.naturalHeight;
-
-    var ctx = canvas.getContext("2d");
-    ctx.drawImage(img, 0, 0);
-
-    whenReady(ctx.getImageData(0, 0, img.naturalWidth, img.naturalHeight));
-  };
-  img.src = src;
-}
-
-function sync_svg_size(imageData) {
-  // We need the size of the 'svg' and its 'image' elements to match the size
-  // of the ImageData objects that we're going to read pixels from or else our
-  // magnify() function will be very broken.
-  ID("svg").setAttribute("width", imageData.width);
-  ID("svg").setAttribute("height", imageData.height);
-}
-
-function show_images(i) {
-  var item = gTestItems[i];
-  var cell = ID("images");
-
-  // Remove activeitem class from any existing elements
-  var activeItems = document.querySelectorAll(".activeitem");
-  for (var activeItemIdx = activeItems.length; activeItemIdx-- != 0;) {
-    activeItems[activeItemIdx].classList.remove("activeitem");
-  }
-
-  ID("item" + i).classList.add("activeitem");
-  ID("image1").style.display = "";
-  ID("image2").style.display = "none";
-  ID("diffrect").style.display = "none";
-  ID("imgcontrols").reset();
-  ID("pixel-differences").textContent = "";
-
-  ID("image1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
-  // Making the href be #image1 doesn't seem to work
-  ID("feimage1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
-  if (item.images.length == 1) {
-    ID("imgcontrols").style.display = "none";
-  } else {
-    ID("imgcontrols").style.display = "";
-
-    ID("image2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
-    // Making the href be #image2 doesn't seem to work
-    ID("feimage2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
-
-    ID("label1").textContent = 'Image ' + item.imageLabels[0];
-    ID("label2").textContent = 'Image ' + item.imageLabels[1];
-  }
-
-  cell.style.display = "";
-
-  let loaded = [false, false];
-
-  function images_loaded(id) {
-    loaded[id] = true;
-    if (loaded.every(x => x)) {
-      update_pixel_difference_text()
-    }
-  }
-
-  get_image_data(item.images[0], function(data) { gImage1Data = data; sync_svg_size(gImage1Data); images_loaded(0)});
-  get_image_data(item.images[1], function(data) { gImage2Data = data; images_loaded(1)});
-
-}
-
-function update_pixel_difference_text() {
-  let differenceText;
-  if (gImage1Data.height !== gImage2Data.height ||
-      gImage1Data.width !== gImage2Data.width) {
-    differenceText = "Images are different sizes"
-  } else {
-    let [numPixels, maxPerChannel] = get_pixel_differences();
-    if (!numPixels) {
-      differenceText = "Images are identical";
-    } else {
-      differenceText = `Maximum difference per channel ${maxPerChannel}, ${numPixels} pixels differ`;
-    }
-  }
-  // Disable this for now, because per bug 1633504, the numbers may be
-  // inaccurate and dependent on the browser's configuration.
-  ID("pixel-differences").textContent = differenceText;
-}
-
-function get_pixel_differences() {
-  let numPixels = 0;
-  let maxPerChannel = 0;
-  for (var i=0; i<gImage1Data.data.length; i+=4) {
-    let r1 = gImage1Data.data[i];
-    let r2 = gImage2Data.data[i];
-    let g1 = gImage1Data.data[i+1];
-    let g2 = gImage2Data.data[i+1];
-    let b1 = gImage1Data.data[i+2];
-    let b2 = gImage2Data.data[i+2];
-    // Ignore alpha.
-    if (r1 == r2 && g1 == g2 && b1 == b2) {
-      continue;
-    }
-    numPixels += 1;
-    let maxDiff = Math.max(Math.abs(r1-r2),
-                           Math.abs(g1-g2),
-                           Math.abs(b1-b2));
-    if (maxDiff > maxPerChannel) {
-      maxPerChannel = maxDiff
-    }
-  }
-  return [numPixels, maxPerChannel];
-}
-
-function show_image(i) {
-  if (i == 1) {
-    ID("image1").style.display = "";
-    ID("image2").style.display = "none";
-  } else {
-    ID("image1").style.display = "none";
-    ID("image2").style.display = "";
-  }
-}
-
-function handle_keyboard_shortcut(event) {
-  switch (event.charCode) {
-  case 49: // "1" key
-    document.getElementById("radio1").checked = true;
-    show_image(1);
-    break;
-  case 50: // "2" key
-    document.getElementById("radio2").checked = true;
-    show_image(2);
-    break;
-  case 100: // "d" key
-    document.getElementById("differences").click();
-    break;
-  case 112: // "p" key
-    shift_images(-1);
-    break;
-  case 110: // "n" key
-    shift_images(1);
-    break;
-  }
-}
-
-function handle_keydown(event) {
-  switch (event.keyCode) {
-  case 37:  // left arrow
-    move_pixel(-1, 0);
-    break;
-  case 38:  // up arrow
-    move_pixel(0,-1);
-    break;
-  case 39:  // right arrow
-    move_pixel(1, 0);
-    break;
-  case 40:  // down arrow
-    move_pixel(0, 1);
-    break;
-  }
-}
-
-function shift_images(dir) {
-  var activeItem = document.querySelector(".activeitem");
-  if (!activeItem) {
-    return;
-  }
-  for (var elm = activeItem; elm; elm = elm.parentElement) {
-    if (elm.tagName != "tr") {
-      continue;
-    }
-    elm = dir > 0 ? elm.nextElementSibling : elm.previousElementSibling;
-    if (elm) {
-      elm.getElementsByTagName("a")[0].click();
-    }
-    return;
-  }
-}
-
-function show_differences(cb) {
-  ID("diffrect").style.display = cb.checked ? "" : "none";
-}
-
-function flash_pixels(on) {
-  var stroke = on ? "red" : "black";
-  var strokeWidth = on ? "2px" : "1px";
-  for (var i = 0; i < gFlashingPixels.length; i++) {
-    gFlashingPixels[i].setAttribute("stroke", stroke);
-    gFlashingPixels[i].setAttribute("stroke-width", strokeWidth);
-  }
-}
-
-function cursor_point(evt) {
-  var m = evt.target.getScreenCTM().inverse();
-  var p = ID("svg").createSVGPoint();
-  p.x = evt.clientX;
-  p.y = evt.clientY;
-  p = p.matrixTransform(m);
-  return { x: Math.floor(p.x), y: Math.floor(p.y) };
-}
-
-function hex2(i) {
-  return (i < 16 ? "0" : "") + i.toString(16);
-}
-
-function canvas_pixel_as_hex(data, x, y) {
-  var offset = (y * data.width + x) * 4;
-  var r = data.data[offset];
-  var g = data.data[offset + 1];
-  var b = data.data[offset + 2];
-  return "#" + hex2(r) + hex2(g) + hex2(b);
-}
-
-function hex_as_rgb(hex) {
-  return "rgb(" + [parseInt(hex.substring(1, 3), 16), parseInt(hex.substring(3, 5), 16), parseInt(hex.substring(5, 7), 16)] + ")";
-}
-
-function magnify(evt) {
-  var { x: x, y: y } = cursor_point(evt);
-  do_magnify(x, y);
-}
-
-function do_magnify(x, y) {
-  var centerPixelColor1, centerPixelColor2;
-
-  var dx_lo = -Math.floor(gMagWidth / 2);
-  var dx_hi = Math.floor(gMagWidth / 2);
-  var dy_lo = -Math.floor(gMagHeight / 2);
-  var dy_hi = Math.floor(gMagHeight / 2);
-
-  flash_pixels(false);
-  gFlashingPixels = [];
-  for (var j = dy_lo; j <= dy_hi; j++) {
-    for (var i = dx_lo; i <= dx_hi; i++) {
-      var px = x + i;
-      var py = y + j;
-      var p1 = gMagPixPaths[i + dx_hi][j + dy_hi][0];
-      var p2 = gMagPixPaths[i + dx_hi][j + dy_hi][1];
-      // Here we just use the dimensions of gImage1Data since we expect test
-      // and reference to have the same dimensions.
-      if (px < 0 || py < 0 || px >= gImage1Data.width || py >= gImage1Data.height) {
-        p1.setAttribute("fill", "#aaa");
-        p2.setAttribute("fill", "#888");
-      } else {
-        var color1 = canvas_pixel_as_hex(gImage1Data, x + i, y + j);
-        var color2 = canvas_pixel_as_hex(gImage2Data, x + i, y + j);
-        p1.setAttribute("fill", color1);
-        p2.setAttribute("fill", color2);
-        if (color1 != color2) {
-          gFlashingPixels.push(p1, p2);
-          p1.parentNode.appendChild(p1);
-          p2.parentNode.appendChild(p2);
+          var line = lines[j];
+          // Ignore duplicated output in logcat.
+          if (line.match(/I\/Gecko.*?REFTEST/))
+            continue;
+          var match = line.match(/^.*?(?:REFTEST\s+)+(.*)$/);
+          if (!match) {
+            // WPT reftests don't always have the "REFTEST" prefix but do have
+            // mozharness prefixing. Trying to match both prefixes optionally with a
+            // single regex either makes an unreadable mess or matches everything so
+            // we do them separately.
+            match = line.match(/^(?:.*? (?:INFO|ERROR) -\s+)(.*)$/);
+          }
+          if (match)
+            line = match[1];
+          match = line.match(/^(TEST-PASS|TEST-UNEXPECTED-PASS|TEST-FAIL|TEST-KNOWN-FAIL|TEST-UNEXPECTED-FAIL|TEST-DEBUG-INFO|TEST-KNOWN-INTERMITTENT-FAIL|TEST-KNOWN-INTERMITTENT-PASS)(\(EXPECTED RANDOM\)|) \| ([^\|]+)(?: \|(.*)|$)/);
+          if (match) {
+            var state = match[1];
+            var random = match[2];
+            var url = match[3];
+            var extra = match[4];
+            gTestItems.push(
+              {
+                pass: !state.match(/DEBUG-INFO$|FAIL$/),
+                // only one of the following three should ever be true
+                unexpected: !!state.match(/^TEST-UNEXPECTED/),
+                random: (random == "(EXPECTED RANDOM)" || state == "TEST-KNOWN-INTERMITTENT-FAIL" || state == "TEST-KNOWN-INTERMITTENT-PASS"),
+                skip: (extra == " (SKIP)"),
+                url: url,
+                images: [],
+                imageLabels: []
+              });
+            continue;
+          }
+          match = line.match(/^IMAGE([^:]*): (data:.*)$/);
+          if (match) {
+            var item = gTestItems[gTestItems.length - 1];
+            item.images.push(match[2]);
+            item.imageLabels.push(match[1]);
+          }
         }
-        if (i == 0 && j == 0) {
-          centerPixelColor1 = color1;
-          centerPixelColor2 = color2;
+
+        build_viewer();
+      }
+
+      function build_viewer() {
+        if (gTestItems.length == 0) {
+          show_phase("entry");
+          return;
+        }
+
+        var cell = ID("itemlist");
+        while (cell.childNodes.length > 0)
+          cell.removeChild(cell.childNodes[cell.childNodes.length - 1]);
+
+        var table = document.createElement("table");
+        var tbody = document.createElement("tbody");
+        table.appendChild(tbody);
+
+        for (var i in gTestItems) {
+          var item = gTestItems[i];
+
+          // optional url filter for only showing unexpected results
+          if (parseInt(gParams.only_show_unexpected) && !item.unexpected)
+            continue;
+
+          // XXX regardless skip expected pass items until we have filtering UI
+          if (item.pass && !item.unexpected)
+            continue;
+
+          var tr = document.createElement("tr");
+          var rowclass = item.pass ? "pass" : "fail";
+          var td;
+          var text;
+
+          td = document.createElement("td");
+          text = "";
+          if (item.unexpected) { text += "!"; rowclass += " unexpected"; }
+          if (item.random) { text += "R"; rowclass += " random"; }
+          if (item.skip) { text += "S"; rowclass += " skip"; }
+          td.appendChild(document.createTextNode(text));
+          tr.appendChild(td);
+
+          td = document.createElement("td");
+          td.id = "item" + i;
+          td.className = "url";
+          // Only display part of URL after "/mozilla/".
+          var match = item.url.match(/\/mozilla\/(.*)/);
+          text = document.createTextNode(match ? match[1] : item.url);
+          if (item.images.length > 0) {
+            var a = document.createElement("a");
+            a.href = "javascript:show_images(" + i + ")";
+            a.appendChild(text);
+            td.appendChild(a);
+          } else {
+            td.appendChild(text);
+          }
+          tr.appendChild(td);
+
+          tbody.appendChild(tr);
+        }
+
+        cell.appendChild(table);
+
+        show_phase("viewer");
+      }
+
+      function get_image_data(src, whenReady) {
+        var img = new Image();
+        img.onload = function() {
+          var canvas = document.createElement("canvas");
+          canvas.width = img.naturalWidth;
+          canvas.height = img.naturalHeight;
+
+          var ctx = canvas.getContext("2d");
+          ctx.drawImage(img, 0, 0);
+
+          whenReady(ctx.getImageData(0, 0, img.naturalWidth, img.naturalHeight));
+        };
+        img.src = src;
+      }
+
+      function sync_svg_size(imageData) {
+        // We need the size of the 'svg' and its 'image' elements to match the size
+        // of the ImageData objects that we're going to read pixels from or else our
+        // magnify() function will be very broken.
+        ID("svg").setAttribute("width", imageData.width);
+        ID("svg").setAttribute("height", imageData.height);
+      }
+
+      function show_images(i) {
+        var item = gTestItems[i];
+        var cell = ID("images");
+
+        // Remove activeitem class from any existing elements
+        var activeItems = document.querySelectorAll(".activeitem");
+        for (var activeItemIdx = activeItems.length; activeItemIdx-- != 0;) {
+          activeItems[activeItemIdx].classList.remove("activeitem");
+        }
+
+        ID("item" + i).classList.add("activeitem");
+        ID("image1").style.display = "";
+        ID("image2").style.display = "none";
+        ID("diffrect").style.display = "none";
+        ID("imgcontrols").reset();
+        ID("pixel-differences").textContent = "";
+
+        ID("image1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+        // Making the href be #image1 doesn't seem to work
+        ID("feimage1").setAttributeNS(XLINK_NS, "xlink:href", item.images[0]);
+        if (item.images.length == 1) {
+          ID("imgcontrols").style.display = "none";
+        } else {
+          ID("imgcontrols").style.display = "";
+
+          ID("image2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+          // Making the href be #image2 doesn't seem to work
+          ID("feimage2").setAttributeNS(XLINK_NS, "xlink:href", item.images[1]);
+
+          ID("label1").textContent = 'Image ' + item.imageLabels[0];
+          ID("label2").textContent = 'Image ' + item.imageLabels[1];
+        }
+
+        cell.style.display = "";
+
+        let loaded = [false, false];
+
+        function images_loaded(id) {
+          loaded[id] = true;
+          if (loaded.every(x => x)) {
+            update_pixel_difference_text()
+          }
+        }
+
+        get_image_data(item.images[0], function(data) { gImage1Data = data; sync_svg_size(gImage1Data); images_loaded(0)});
+        get_image_data(item.images[1], function(data) { gImage2Data = data; images_loaded(1)});
+
+      }
+
+      function update_pixel_difference_text() {
+        let differenceText;
+        if (gImage1Data.height !== gImage2Data.height ||
+            gImage1Data.width !== gImage2Data.width) {
+          differenceText = "Images are different sizes"
+        } else {
+          let [numPixels, maxPerChannel] = get_pixel_differences();
+          if (!numPixels) {
+            differenceText = "Images are identical";
+          } else {
+            differenceText = `Maximum difference per channel ${maxPerChannel}, ${numPixels} pixels differ`;
+          }
+        }
+        // Disable this for now, because per bug 1633504, the numbers may be
+        // inaccurate and dependent on the browser's configuration.
+        ID("pixel-differences").textContent = differenceText;
+      }
+
+      function get_pixel_differences() {
+        let numPixels = 0;
+        let maxPerChannel = 0;
+        for (var i=0; i<gImage1Data.data.length; i+=4) {
+          let r1 = gImage1Data.data[i];
+          let r2 = gImage2Data.data[i];
+          let g1 = gImage1Data.data[i+1];
+          let g2 = gImage2Data.data[i+1];
+          let b1 = gImage1Data.data[i+2];
+          let b2 = gImage2Data.data[i+2];
+          // Ignore alpha.
+          if (r1 == r2 && g1 == g2 && b1 == b2) {
+            continue;
+          }
+          numPixels += 1;
+          let maxDiff = Math.max(Math.abs(r1-r2),
+                                 Math.abs(g1-g2),
+                                 Math.abs(b1-b2));
+          if (maxDiff > maxPerChannel) {
+            maxPerChannel = maxDiff
+          }
+        }
+        return [numPixels, maxPerChannel];
+      }
+
+      function show_image(i) {
+        if (i == 1) {
+          ID("image1").style.display = "";
+          ID("image2").style.display = "none";
+        } else {
+          ID("image1").style.display = "none";
+          ID("image2").style.display = "";
         }
       }
-    }
-  }
-  flash_pixels(true);
-  show_pixelinfo(x, y, centerPixelColor1, hex_as_rgb(centerPixelColor1), centerPixelColor2, hex_as_rgb(centerPixelColor2));
-}
 
-function show_pixelinfo(x, y, pix1rgb, pix1hex, pix2rgb, pix2hex) {
-  var pixelinfo = ID("pixelinfo");
-  ID("coords").textContent = [x, y];
-  ID("pix1hex").textContent = pix1hex;
-  ID("pix1rgb").textContent = pix1rgb;
-  ID("pix2hex").textContent = pix2hex;
-  ID("pix2rgb").textContent = pix2rgb;
-}
+      function handle_keyboard_shortcut(event) {
+        switch (event.charCode) {
+        case 49: // "1" key
+          document.getElementById("radio1").checked = true;
+          show_image(1);
+          break;
+        case 50: // "2" key
+          document.getElementById("radio2").checked = true;
+          show_image(2);
+          break;
+        case 100: // "d" key
+          document.getElementById("differences").click();
+          break;
+        case 112: // "p" key
+          shift_images(-1);
+          break;
+        case 110: // "n" key
+          shift_images(1);
+          break;
+        }
+      }
 
-function move_pixel(deltax, deltay) {
-  coords = ID("coords").textContent.split(',');
-  x = parseInt(coords[0]);
-  y = parseInt(coords[1]);
-  if (isNaN(x) || isNaN(y)) {
-    return;
-  }
-  x = x + deltax;
-  y = y + deltay;
-  if (x >= 0 && y >= 0 && x < gImage1Data.width && y < gImage1Data.height) {
-    do_magnify(x, y);
-  }
-}
+      function handle_keydown(event) {
+        switch (event.keyCode) {
+        case 37:  // left arrow
+          move_pixel(-1, 0);
+          break;
+        case 38:  // up arrow
+          move_pixel(0,-1);
+          break;
+        case 39:  // right arrow
+          move_pixel(1, 0);
+          break;
+        case 40:  // down arrow
+          move_pixel(0, 1);
+          break;
+        }
+      }
 
-  ]]></script>
+      function shift_images(dir) {
+        var activeItem = document.querySelector(".activeitem");
+        if (!activeItem) {
+          return;
+        }
+        for (var elm = activeItem; elm; elm = elm.parentElement) {
+          if (elm.tagName != "tr") {
+            continue;
+          }
+          elm = dir > 0 ? elm.nextElementSibling : elm.previousElementSibling;
+          if (elm) {
+            elm.getElementsByTagName("a")[0].click();
+          }
+          return;
+        }
+      }
 
-</head>
-<body onload="load()">
+      function show_differences(cb) {
+        ID("diffrect").style.display = cb.checked ? "" : "none";
+      }
 
-<div id="entry">
+      function flash_pixels(on) {
+        var stroke = on ? "red" : "black";
+        var strokeWidth = on ? "2px" : "1px";
+        for (var i = 0; i < gFlashingPixels.length; i++) {
+          gFlashingPixels[i].setAttribute("stroke", stroke);
+          gFlashingPixels[i].setAttribute("stroke-width", strokeWidth);
+        }
+      }
 
-<h1>Reftest analyzer: load reftest log</h1>
+      function cursor_point(evt) {
+        var m = evt.target.getScreenCTM().inverse();
+        var p = ID("svg").createSVGPoint();
+        p.x = evt.clientX;
+        p.y = evt.clientY;
+        p = p.matrixTransform(m);
+        return { x: Math.floor(p.x), y: Math.floor(p.y) };
+      }
 
-<p>Either paste your log into this textarea:<br />
-<textarea cols="80" rows="10" id="logentry"/><br/>
-<input type="button" value="Process pasted log" onclick="log_pasted()" /></p>
+      function hex2(i) {
+        return (i < 16 ? "0" : "") + i.toString(16);
+      }
 
-<p>... or load it from a file:<br/>
-<input type="file" id="fileentry" onchange="fileentry_changed()" />
-</p>
-</div>
+      function canvas_pixel_as_hex(data, x, y) {
+        var offset = (y * data.width + x) * 4;
+        var r = data.data[offset];
+        var g = data.data[offset + 1];
+        var b = data.data[offset + 2];
+        return "#" + hex2(r) + hex2(g) + hex2(b);
+      }
 
-<div id="loading" style="display:none">Loading log...</div>
+      function hex_as_rgb(hex) {
+        return "rgb(" + [parseInt(hex.substring(1, 3), 16), parseInt(hex.substring(3, 5), 16), parseInt(hex.substring(5, 7), 16)] + ")";
+      }
 
-<div id="viewer" style="display:none">
-  <div id="pixelarea">
-    <div id="pixelinfo">
-      <table>
-        <tbody>
-          <tr><th>Pixel at:</th><td colspan="2" id="coords"/></tr>
-          <tr><th>Image 1:</th><td id="pix1rgb"></td><td id="pix1hex"></td></tr>
-          <tr><th>Image 2:</th><td id="pix2rgb"></td><td id="pix2hex"></td></tr>
-        </tbody>
-      </table>
-      <div>
-        <div id="pixelhint">★
+      function magnify(evt) {
+        var { x: x, y: y } = cursor_point(evt);
+        do_magnify(x, y);
+      }
+
+      function do_magnify(x, y) {
+        var centerPixelColor1, centerPixelColor2;
+
+        var dx_lo = -Math.floor(gMagWidth / 2);
+        var dx_hi = Math.floor(gMagWidth / 2);
+        var dy_lo = -Math.floor(gMagHeight / 2);
+        var dy_hi = Math.floor(gMagHeight / 2);
+
+        flash_pixels(false);
+        gFlashingPixels = [];
+        for (var j = dy_lo; j <= dy_hi; j++) {
+          for (var i = dx_lo; i <= dx_hi; i++) {
+            var px = x + i;
+            var py = y + j;
+            var p1 = gMagPixPaths[i + dx_hi][j + dy_hi][0];
+            var p2 = gMagPixPaths[i + dx_hi][j + dy_hi][1];
+            // Here we just use the dimensions of gImage1Data since we expect test
+            // and reference to have the same dimensions.
+            if (px < 0 || py < 0 || px >= gImage1Data.width || py >= gImage1Data.height) {
+              p1.setAttribute("fill", "#aaa");
+              p2.setAttribute("fill", "#888");
+            } else {
+              var color1 = canvas_pixel_as_hex(gImage1Data, x + i, y + j);
+              var color2 = canvas_pixel_as_hex(gImage2Data, x + i, y + j);
+              p1.setAttribute("fill", color1);
+              p2.setAttribute("fill", color2);
+              if (color1 != color2) {
+                gFlashingPixels.push(p1, p2);
+                p1.parentNode.appendChild(p1);
+                p2.parentNode.appendChild(p2);
+              }
+              if (i == 0 && j == 0) {
+                centerPixelColor1 = color1;
+                centerPixelColor2 = color2;
+              }
+            }
+          }
+        }
+        flash_pixels(true);
+        show_pixelinfo(x, y, centerPixelColor1, hex_as_rgb(centerPixelColor1), centerPixelColor2, hex_as_rgb(centerPixelColor2));
+      }
+
+      function show_pixelinfo(x, y, pix1rgb, pix1hex, pix2rgb, pix2hex) {
+        var pixelinfo = ID("pixelinfo");
+        ID("coords").textContent = [x, y];
+        ID("pix1hex").textContent = pix1hex;
+        ID("pix1rgb").textContent = pix1rgb;
+        ID("pix2hex").textContent = pix2hex;
+        ID("pix2rgb").textContent = pix2rgb;
+      }
+
+      function move_pixel(deltax, deltay) {
+        coords = ID("coords").textContent.split(',');
+        x = parseInt(coords[0]);
+        y = parseInt(coords[1]);
+        if (isNaN(x) || isNaN(y)) {
+          return;
+        }
+        x = x + deltax;
+        y = y + deltay;
+        if (x >= 0 && y >= 0 && x < gImage1Data.width && y < gImage1Data.height) {
+          do_magnify(x, y);
+        }
+      }
+
+        ]]>
+    </script>
+  </head>
+  <body onload="load()">
+    <div id="entry">
+      <h1>Reftest analyzer: load reftest log</h1>
+
+      <p>
+        Either paste your log into this textarea:<br />
+        <textarea cols="80" rows="10" id="logentry" /><br />
+        <input
+          type="button"
+          value="Process pasted log"
+          onclick="log_pasted()"
+        />
+      </p>
+
+      <p>
+        ... or load it from a file:<br />
+        <input type="file" id="fileentry" onchange="fileentry_changed()" />
+      </p>
+    </div>
+
+    <div id="loading" style="display: none">Loading log...</div>
+
+    <div id="viewer" style="display: none">
+      <div id="pixelarea">
+        <div id="pixelinfo">
+          <table>
+            <tbody>
+              <tr>
+                <th>Pixel at:</th>
+                <td colspan="2" id="coords" />
+              </tr>
+              <tr>
+                <th>Image 1:</th>
+                <td id="pix1rgb"></td>
+                <td id="pix1hex"></td>
+              </tr>
+              <tr>
+                <th>Image 2:</th>
+                <td id="pix2rgb"></td>
+                <td id="pix2hex"></td>
+              </tr>
+            </tbody>
+          </table>
           <div>
-            <p>Move the mouse over the reftest image on the right to show
-            magnified pixels on the left.  The color information above is for
-            the pixel centered in the magnified view.</p>
-            <p>Image 1 is shown in the upper triangle of each pixel and Image 2
-            is shown in the lower triangle.</p>
+            <div id="pixelhint">
+              ★
+              <div>
+                <p>
+                  Move the mouse over the reftest image on the right to show
+                  magnified pixels on the left. The color information above is
+                  for the pixel centered in the magnified view.
+                </p>
+                <p>
+                  Image 1 is shown in the upper triangle of each pixel and Image
+                  2 is shown in the lower triangle.
+                </p>
+              </div>
+            </div>
           </div>
         </div>
+        <div id="magnification">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="84"
+            height="84"
+            shape-rendering="optimizeSpeed"
+          >
+            <g id="mag" />
+          </svg>
+        </div>
       </div>
-    </div>
-    <div id="magnification">
-      <svg xmlns="http://www.w3.org/2000/svg" width="84" height="84" shape-rendering="optimizeSpeed">
-        <g id="mag"/>
-      </svg>
-    </div>
-  </div>
-  <div id="itemlist"></div>
-  <div id="images" style="display:none">
-    <form id="imgcontrols">
-    <input id="radio1" type="radio" name="which" value="0" onchange="show_image(1)" checked="checked" /><label id="label1" title="1" for="radio1">Image 1</label>
-    <input id="radio2" type="radio" name="which" value="1" onchange="show_image(2)"                   /><label id="label2" title="2" for="radio2">Image 2</label>
-    <label><input id="differences" type="checkbox" onchange="show_differences(this)" />Circle differences</label>
-    </form>
-    <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="800" height="1000" id="svg">
-      <defs>
-        <!-- use sRGB to avoid loss of data -->
-        <filter id="showDifferences" x="0%" y="0%" width="100%" height="100%"
-                style="color-interpolation-filters: sRGB">
-          <feImage id="feimage1" result="img1" xlink:href="#image1" />
-          <feImage id="feimage2" result="img2" xlink:href="#image2" />
-          <!-- inv1 and inv2 are the images with RGB inverted -->
-          <feComponentTransfer result="inv1" in="img1">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <feComponentTransfer result="inv2" in="img2">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <!-- w1 will have non-white pixels anywhere that img2
+      <div id="itemlist"></div>
+      <div id="images" style="display: none">
+        <form id="imgcontrols">
+          <input
+            id="radio1"
+            type="radio"
+            name="which"
+            value="0"
+            onchange="show_image(1)"
+            checked="checked"
+          /><label id="label1" title="1" for="radio1">Image 1</label>
+          <input
+            id="radio2"
+            type="radio"
+            name="which"
+            value="1"
+            onchange="show_image(2)"
+          /><label id="label2" title="2" for="radio2">Image 2</label>
+          <label
+            ><input
+              id="differences"
+              type="checkbox"
+              onchange="show_differences(this)"
+            />Circle differences</label
+          >
+        </form>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          xmlns:xlink="http://www.w3.org/1999/xlink"
+          version="1.1"
+          width="800"
+          height="1000"
+          id="svg"
+        >
+          <defs>
+            <!-- use sRGB to avoid loss of data -->
+            <filter
+              id="showDifferences"
+              x="0%"
+              y="0%"
+              width="100%"
+              height="100%"
+              style="color-interpolation-filters: sRGB"
+            >
+              <feImage id="feimage1" result="img1" xlink:href="#image1" />
+              <feImage id="feimage2" result="img2" xlink:href="#image2" />
+              <!-- inv1 and inv2 are the images with RGB inverted -->
+              <feComponentTransfer result="inv1" in="img1">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <feComponentTransfer result="inv2" in="img2">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <!-- w1 will have non-white pixels anywhere that img2
                is brighter than img1, and w2 for the reverse.
                It would be nice not to have to go through these
                intermediate states, but feComposite
                type="arithmetic" can't transform the RGB channels
                and leave the alpha channel untouched. -->
-          <feComposite result="w1" in="img1" in2="inv2" operator="arithmetic" k2="1" k3="1" />
-          <feComposite result="w2" in="img2" in2="inv1" operator="arithmetic" k2="1" k3="1" />
-          <!-- c1 will have non-black pixels anywhere that img2
+              <feComposite
+                result="w1"
+                in="img1"
+                in2="inv2"
+                operator="arithmetic"
+                k2="1"
+                k3="1"
+              />
+              <feComposite
+                result="w2"
+                in="img2"
+                in2="inv1"
+                operator="arithmetic"
+                k2="1"
+                k3="1"
+              />
+              <!-- c1 will have non-black pixels anywhere that img2
                is brighter than img1, and c2 for the reverse -->
-          <feComponentTransfer result="c1" in="w1">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <feComponentTransfer result="c2" in="w2">
-            <feFuncR type="linear" slope="-1" intercept="1" />
-            <feFuncG type="linear" slope="-1" intercept="1" />
-            <feFuncB type="linear" slope="-1" intercept="1" />
-          </feComponentTransfer>
-          <!-- c will be nonblack (and fully on) for every pixel+component where there are differences -->
-          <feComposite result="c" in="c1" in2="c2" operator="arithmetic" k2="255" k3="255" />
-          <!-- a will be opaque for every pixel with differences and transparent for all others -->
-          <feColorMatrix result="a" type="matrix" values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  1 1 1 0 0" />
+              <feComponentTransfer result="c1" in="w1">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <feComponentTransfer result="c2" in="w2">
+                <feFuncR type="linear" slope="-1" intercept="1" />
+                <feFuncG type="linear" slope="-1" intercept="1" />
+                <feFuncB type="linear" slope="-1" intercept="1" />
+              </feComponentTransfer>
+              <!-- c will be nonblack (and fully on) for every pixel+component where there are differences -->
+              <feComposite
+                result="c"
+                in="c1"
+                in2="c2"
+                operator="arithmetic"
+                k2="255"
+                k3="255"
+              />
+              <!-- a will be opaque for every pixel with differences and transparent for all others -->
+              <feColorMatrix
+                result="a"
+                type="matrix"
+                values="0 0 0 0 0  0 0 0 0 0  0 0 0 0 0  1 1 1 0 0"
+              />
 
-          <!-- a, dilated by 1 pixel -->
-          <feMorphology result="dila1" in="a" operator="dilate" radius="1" />
-          <!-- a, dilated by 2 pixels -->
-          <feMorphology result="dila2" in="dila1" operator="dilate" radius="1" />
+              <!-- a, dilated by 1 pixel -->
+              <feMorphology
+                result="dila1"
+                in="a"
+                operator="dilate"
+                radius="1"
+              />
+              <!-- a, dilated by 2 pixels -->
+              <feMorphology
+                result="dila2"
+                in="dila1"
+                operator="dilate"
+                radius="1"
+              />
 
-          <!-- all the pixels in the 2-pixel dilation of a but not in the 1-pixel dilation, to highlight the diffs -->
-          <feComposite result="highlight" in="dila2" in2="dila1" operator="out" />
+              <!-- all the pixels in the 2-pixel dilation of a but not in the 1-pixel dilation, to highlight the diffs -->
+              <feComposite
+                result="highlight"
+                in="dila2"
+                in2="dila1"
+                operator="out"
+              />
 
-          <feFlood result="red" flood-color="red" />
-          <feComposite result="redhighlight" in="red" in2="highlight" operator="in" />
-          <feFlood result="black" flood-color="black" flood-opacity="0.5" />
-          <feMerge>
-            <feMergeNode in="black" />
-            <feMergeNode in="redhighlight" />
-          </feMerge>
-        </filter>
-      </defs>
-      <g onmousemove="magnify(evt)">
-        <image x="0" y="0" width="100%" height="100%" id="image1" />
-        <image x="0" y="0" width="100%" height="100%" id="image2" />
-      </g>
-      <rect id="diffrect" filter="url(#showDifferences)" pointer-events="none" x="0" y="0" width="100%" height="100%" />
-    </svg>
-    <div id="pixel-differences"></div>
-  </div>
-</div>
-
-</body>
+              <feFlood result="red" flood-color="red" />
+              <feComposite
+                result="redhighlight"
+                in="red"
+                in2="highlight"
+                operator="in"
+              />
+              <feFlood result="black" flood-color="black" flood-opacity="0.5" />
+              <feMerge>
+                <feMergeNode in="black" />
+                <feMergeNode in="redhighlight" />
+              </feMerge>
+            </filter>
+          </defs>
+          <g onmousemove="magnify(evt)">
+            <image x="0" y="0" width="100%" height="100%" id="image1" />
+            <image x="0" y="0" width="100%" height="100%" id="image2" />
+          </g>
+          <rect
+            id="diffrect"
+            filter="url(#showDifferences)"
+            pointer-events="none"
+            x="0"
+            y="0"
+            width="100%"
+            height="100%"
+          />
+        </svg>
+        <div id="pixel-differences"></div>
+      </div>
+    </div>
+  </body>
 </html>
diff --git a/layout/tools/reftest/reftest-content.js b/layout/tools/reftest/reftest-content.js
index 490f030180ba..9374432742a4 100644
--- a/layout/tools/reftest/reftest-content.js
+++ b/layout/tools/reftest/reftest-content.js
@@ -8,20 +8,23 @@ const DEBUG_CONTRACTID = "@mozilla.org/xpcom/debug;1";
 const PRINTSETTINGS_CONTRACTID = "@mozilla.org/gfx/printsettings-service;1";
 const NS_OBSERVER_SERVICE_CONTRACTID = "@mozilla.org/observer-service;1";
 const NS_GFXINFO_CONTRACTID = "@mozilla.org/gfx/info;1";
-const IO_SERVICE_CONTRACTID = "@mozilla.org/network/io-service;1"
+const IO_SERVICE_CONTRACTID = "@mozilla.org/network/io-service;1";
 
 // "<!--CLEAR-->"
-const BLANK_URL_FOR_CLEARING = "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
+const BLANK_URL_FOR_CLEARING =
+  "data:text/html;charset=UTF-8,%3C%21%2D%2DCLEAR%2D%2D%3E";
 
 const { setTimeout, clearTimeout } = ChromeUtils.importESModule(
-    "resource://gre/modules/Timer.sys.mjs"
+  "resource://gre/modules/Timer.sys.mjs"
 );
 const { onSpellCheck } = ChromeUtils.importESModule(
-    "resource://reftest/AsyncSpellCheckTestHelper.sys.mjs"
+  "resource://reftest/AsyncSpellCheckTestHelper.sys.mjs"
 );
 
 // This will load chrome Custom Elements inside chrome documents:
-ChromeUtils.importESModule("resource://gre/modules/CustomElementsListener.sys.mjs");
+ChromeUtils.importESModule(
+  "resource://gre/modules/CustomElementsListener.sys.mjs"
+);
 
 var gBrowserIsRemote;
 var gHaveCanvasSnapshot = false;
@@ -41,39 +44,40 @@ var gVerbose = false;
 var gCurrentTestStartTime;
 var gClearingForAssertionCheck = false;
 
-const TYPE_LOAD = 'load';  // test without a reference (just test that it does
-                           // not assert, crash, hang, or leak)
-const TYPE_SCRIPT = 'script'; // test contains individual test results
-const TYPE_PRINT = 'print'; // test and reference will be printed to PDF's and
-                            // compared structurally
+const TYPE_LOAD = "load"; // test without a reference (just test that it does
+// not assert, crash, hang, or leak)
+const TYPE_SCRIPT = "script"; // test contains individual test results
+const TYPE_PRINT = "print"; // test and reference will be printed to PDF's and
+// compared structurally
 
 // keep this in sync with globals.jsm
-const URL_TARGET_TYPE_TEST = 0;      // first url
+const URL_TARGET_TYPE_TEST = 0; // first url
 const URL_TARGET_TYPE_REFERENCE = 1; // second url, if any
 
 function webNavigation() {
-    return docShell.QueryInterface(Ci.nsIWebNavigation);
+  return docShell.QueryInterface(Ci.nsIWebNavigation);
 }
 
 function webProgress() {
-    return docShell.QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIWebProgress);
+  return docShell
+    .QueryInterface(Ci.nsIInterfaceRequestor)
+    .getInterface(Ci.nsIWebProgress);
 }
 
 function windowUtilsForWindow(w) {
-    return w.windowUtils;
+  return w.windowUtils;
 }
 
 function windowUtils() {
-    return windowUtilsForWindow(content);
+  return windowUtilsForWindow(content);
 }
 
-function IDForEventTarget(event)
-{
-    try {
-        return "'" + event.target.getAttribute('id') + "'";
-    } catch (ex) {
-        return "<unknown>";
-    }
+function IDForEventTarget(event) {
+  try {
+    return "'" + event.target.getAttribute("id") + "'";
+  } catch (ex) {
+    return "<unknown>";
+  }
 }
 
 var progressListener = {
@@ -86,7 +90,8 @@ var progressListener = {
       return;
     }
     const WPL = Ci.nsIWebProgressListener;
-    const endFlags = WPL.STATE_STOP | WPL.STATE_IS_WINDOW | WPL.STATE_IS_NETWORK;
+    const endFlags =
+      WPL.STATE_STOP | WPL.STATE_IS_WINDOW | WPL.STATE_IS_NETWORK;
     if ((flags & endFlags) == endFlags) {
       OnDocumentLoad(uri);
     }
@@ -97,31 +102,32 @@ var progressListener = {
   ]),
 };
 
-function OnInitialLoad()
-{
-    removeEventListener("load", OnInitialLoad, true);
+function OnInitialLoad() {
+  removeEventListener("load", OnInitialLoad, true);
 
-    gDebug = Cc[DEBUG_CONTRACTID].getService(Ci.nsIDebug2);
-    if (gDebug.isDebugBuild) {
-        gAssertionCount = gDebug.assertionCount;
-    }
-    gVerbose = !!Services.env.get("MOZ_REFTEST_VERBOSE");
+  gDebug = Cc[DEBUG_CONTRACTID].getService(Ci.nsIDebug2);
+  if (gDebug.isDebugBuild) {
+    gAssertionCount = gDebug.assertionCount;
+  }
+  gVerbose = !!Services.env.get("MOZ_REFTEST_VERBOSE");
 
-    RegisterMessageListeners();
+  RegisterMessageListeners();
 
-    var initInfo = SendContentReady();
-    gBrowserIsRemote = initInfo.remote;
+  var initInfo = SendContentReady();
+  gBrowserIsRemote = initInfo.remote;
 
-    webProgress().addProgressListener(progressListener, Ci.nsIWebProgress.NOTIFY_STATE_WINDOW);
+  webProgress().addProgressListener(
+    progressListener,
+    Ci.nsIWebProgress.NOTIFY_STATE_WINDOW
+  );
 
-    LogInfo("Using browser remote="+ gBrowserIsRemote +"\n");
+  LogInfo("Using browser remote=" + gBrowserIsRemote + "\n");
 }
 
-function SetFailureTimeout(cb, timeout, uri)
-{
+function SetFailureTimeout(cb, timeout, uri) {
   var targetTime = Date.now() + timeout;
 
-  var wrapper = function() {
+  var wrapper = function () {
     // Timeouts can fire prematurely in some cases (e.g. in chaos mode). If this
     // happens, set another timeout for the remaining time.
     let remainingMs = targetTime - Date.now();
@@ -130,277 +136,310 @@ function SetFailureTimeout(cb, timeout, uri)
     } else {
       cb();
     }
-  }
+  };
 
   // Once OnDocumentLoad is called to handle the 'load' event it will update
   // this error message to reflect what stage of the processing it has reached
   // as it advances to each stage in turn.
-  gFailureReason = "timed out after " + timeout +
-                   " ms waiting for 'load' event for " + uri;
+  gFailureReason =
+    "timed out after " + timeout + " ms waiting for 'load' event for " + uri;
   gFailureTimeout = setTimeout(wrapper, timeout);
 }
 
-function StartTestURI(type, uri, uriTargetType, timeout)
-{
-    // The GC is only able to clean up compartments after the CC runs. Since
-    // the JS ref tests disable the normal browser chrome and do not otherwise
-    // create substatial DOM garbage, the CC tends not to run enough normally.
-    windowUtils().runNextCollectorTimer();
+function StartTestURI(type, uri, uriTargetType, timeout) {
+  // The GC is only able to clean up compartments after the CC runs. Since
+  // the JS ref tests disable the normal browser chrome and do not otherwise
+  // create substatial DOM garbage, the CC tends not to run enough normally.
+  windowUtils().runNextCollectorTimer();
 
-    gCurrentTestType = type;
-    gCurrentURL = uri;
-    gCurrentURLTargetType = uriTargetType;
-    gCurrentURLRecordResults = 0;
+  gCurrentTestType = type;
+  gCurrentURL = uri;
+  gCurrentURLTargetType = uriTargetType;
+  gCurrentURLRecordResults = 0;
 
-    gCurrentTestStartTime = Date.now();
-    if (gFailureTimeout != null) {
-        SendException("program error managing timeouts\n");
-    }
-    SetFailureTimeout(LoadFailed, timeout, uri);
+  gCurrentTestStartTime = Date.now();
+  if (gFailureTimeout != null) {
+    SendException("program error managing timeouts\n");
+  }
+  SetFailureTimeout(LoadFailed, timeout, uri);
 
-    LoadURI(gCurrentURL);
+  LoadURI(gCurrentURL);
 }
 
 function setupTextZoom(contentRootElement) {
-    if (!contentRootElement || !contentRootElement.hasAttribute('reftest-text-zoom'))
-        return;
-    docShell.browsingContext.textZoom =
-        contentRootElement.getAttribute('reftest-text-zoom');
+  if (
+    !contentRootElement ||
+    !contentRootElement.hasAttribute("reftest-text-zoom")
+  )
+    return;
+  docShell.browsingContext.textZoom =
+    contentRootElement.getAttribute("reftest-text-zoom");
 }
 
 function setupFullZoom(contentRootElement) {
-    if (!contentRootElement || !contentRootElement.hasAttribute('reftest-zoom'))
-        return;
-    docShell.browsingContext.fullZoom =
-        contentRootElement.getAttribute('reftest-zoom');
+  if (!contentRootElement || !contentRootElement.hasAttribute("reftest-zoom"))
+    return;
+  docShell.browsingContext.fullZoom =
+    contentRootElement.getAttribute("reftest-zoom");
 }
 
 function resetZoomAndTextZoom() {
-    docShell.browsingContext.fullZoom = 1.0;
-    docShell.browsingContext.textZoom = 1.0;
+  docShell.browsingContext.fullZoom = 1.0;
+  docShell.browsingContext.textZoom = 1.0;
 }
 
 function doPrintMode(contentRootElement) {
-    // use getAttribute because className works differently in HTML and SVG
-    if (contentRootElement &&
-        contentRootElement.hasAttribute('class')) {
-        var classList = contentRootElement.getAttribute('class').split(/\s+/);
-        if (classList.includes("reftest-print")) {
-            SendException("reftest-print is obsolete, use reftest-paged instead");
-            return;
-        }
-        return classList.includes("reftest-paged");
+  // use getAttribute because className works differently in HTML and SVG
+  if (contentRootElement && contentRootElement.hasAttribute("class")) {
+    var classList = contentRootElement.getAttribute("class").split(/\s+/);
+    if (classList.includes("reftest-print")) {
+      SendException("reftest-print is obsolete, use reftest-paged instead");
+      return;
     }
+    return classList.includes("reftest-paged");
+  }
 }
 
 function setupPrintMode(contentRootElement) {
-    var PSSVC =
-        Cc[PRINTSETTINGS_CONTRACTID].getService(Ci.nsIPrintSettingsService);
-    var ps = PSSVC.createNewPrintSettings();
-    ps.paperWidth = 5;
-    ps.paperHeight = 3;
+  var PSSVC = Cc[PRINTSETTINGS_CONTRACTID].getService(
+    Ci.nsIPrintSettingsService
+  );
+  var ps = PSSVC.createNewPrintSettings();
+  ps.paperWidth = 5;
+  ps.paperHeight = 3;
 
-    // Override any os-specific unwriteable margins
-    ps.unwriteableMarginTop = 0;
-    ps.unwriteableMarginLeft = 0;
-    ps.unwriteableMarginBottom = 0;
-    ps.unwriteableMarginRight = 0;
+  // Override any os-specific unwriteable margins
+  ps.unwriteableMarginTop = 0;
+  ps.unwriteableMarginLeft = 0;
+  ps.unwriteableMarginBottom = 0;
+  ps.unwriteableMarginRight = 0;
 
-    ps.headerStrLeft = "";
-    ps.headerStrCenter = "";
-    ps.headerStrRight = "";
-    ps.footerStrLeft = "";
-    ps.footerStrCenter = "";
-    ps.footerStrRight = "";
+  ps.headerStrLeft = "";
+  ps.headerStrCenter = "";
+  ps.headerStrRight = "";
+  ps.footerStrLeft = "";
+  ps.footerStrCenter = "";
+  ps.footerStrRight = "";
 
-    const printBackgrounds = (() => {
-        const attr = contentRootElement.getAttribute("reftest-paged-backgrounds");
-        return !attr || attr != "false";
-    })();
-    ps.printBGColors = printBackgrounds;
-    ps.printBGImages = printBackgrounds;
+  const printBackgrounds = (() => {
+    const attr = contentRootElement.getAttribute("reftest-paged-backgrounds");
+    return !attr || attr != "false";
+  })();
+  ps.printBGColors = printBackgrounds;
+  ps.printBGImages = printBackgrounds;
 
-    docShell.contentViewer.setPageModeForTesting(/* aPageMode */ true, ps);
+  docShell.contentViewer.setPageModeForTesting(/* aPageMode */ true, ps);
 }
 
 // Message the parent process to ask it to print the current page to a PDF file.
 function printToPdf() {
-    let currentDoc = content.document;
-    let isPrintSelection = false;
-    let printRange = '';
+  let currentDoc = content.document;
+  let isPrintSelection = false;
+  let printRange = "";
 
-    if (currentDoc) {
-        let contentRootElement = currentDoc.documentElement;
-        printRange = contentRootElement.getAttribute("reftest-print-range") || '';
+  if (currentDoc) {
+    let contentRootElement = currentDoc.documentElement;
+    printRange = contentRootElement.getAttribute("reftest-print-range") || "";
+  }
+
+  if (printRange) {
+    if (printRange === "selection") {
+      isPrintSelection = true;
+    } else if (
+      !printRange.split(",").every(range => /^[1-9]\d*-[1-9]\d*$/.test(range))
+    ) {
+      SendException("invalid value for reftest-print-range");
+      return;
     }
+  }
 
-    if (printRange) {
-        if (printRange === 'selection') {
-            isPrintSelection = true;
-        } else if (!printRange.split(',').every(range => /^[1-9]\d*-[1-9]\d*$/.test(range))) {
-            SendException("invalid value for reftest-print-range");
-            return;
-        }
-    }
-
-    SendStartPrint(isPrintSelection, printRange);
+  SendStartPrint(isPrintSelection, printRange);
 }
 
 function attrOrDefault(element, attr, def) {
-    return element.hasAttribute(attr) ? Number(element.getAttribute(attr)) : def;
+  return element.hasAttribute(attr) ? Number(element.getAttribute(attr)) : def;
 }
 
 function setupViewport(contentRootElement) {
-    if (!contentRootElement) {
-        return;
-    }
+  if (!contentRootElement) {
+    return;
+  }
 
-    var sw = attrOrDefault(contentRootElement, "reftest-scrollport-w", 0);
-    var sh = attrOrDefault(contentRootElement, "reftest-scrollport-h", 0);
-    if (sw !== 0 || sh !== 0) {
-        LogInfo("Setting viewport to <w=" + sw + ", h=" + sh + ">");
-        windowUtils().setVisualViewportSize(sw, sh);
-    }
+  var sw = attrOrDefault(contentRootElement, "reftest-scrollport-w", 0);
+  var sh = attrOrDefault(contentRootElement, "reftest-scrollport-h", 0);
+  if (sw !== 0 || sh !== 0) {
+    LogInfo("Setting viewport to <w=" + sw + ", h=" + sh + ">");
+    windowUtils().setVisualViewportSize(sw, sh);
+  }
 
-    var res = attrOrDefault(contentRootElement, "reftest-resolution", 1);
-    if (res !== 1) {
-        LogInfo("Setting resolution to " + res);
-        windowUtils().setResolutionAndScaleTo(res);
-    }
+  var res = attrOrDefault(contentRootElement, "reftest-resolution", 1);
+  if (res !== 1) {
+    LogInfo("Setting resolution to " + res);
+    windowUtils().setResolutionAndScaleTo(res);
+  }
 
-    // XXX support viewconfig when needed
+  // XXX support viewconfig when needed
 }
 
-
 function setupDisplayport(contentRootElement) {
-    let promise = content.windowGlobalChild.getActor("ReftestFission").SetupDisplayportRoot();
-    return promise.then(function(result) {
-        for (let errorString of result.errorStrings) {
-            LogError(errorString);
-        }
-        for (let infoString of result.infoStrings) {
-            LogInfo(infoString);
-        }
+  let promise = content.windowGlobalChild
+    .getActor("ReftestFission")
+    .SetupDisplayportRoot();
+  return promise.then(
+    function (result) {
+      for (let errorString of result.errorStrings) {
+        LogError(errorString);
+      }
+      for (let infoString of result.infoStrings) {
+        LogInfo(infoString);
+      }
     },
-    function(reason) {
-        LogError("SetupDisplayportRoot returned promise rejected: " + reason);
-    });
+    function (reason) {
+      LogError("SetupDisplayportRoot returned promise rejected: " + reason);
+    }
+  );
 }
 
 // Returns whether any offsets were updated
 function setupAsyncScrollOffsets(options) {
-    let currentDoc = content.document;
-    let contentRootElement = currentDoc ? currentDoc.documentElement : null;
+  let currentDoc = content.document;
+  let contentRootElement = currentDoc ? currentDoc.documentElement : null;
 
-    if (!contentRootElement || !contentRootElement.hasAttribute("reftest-async-scroll")) {
-        return Promise.resolve(false);
-    }
+  if (
+    !contentRootElement ||
+    !contentRootElement.hasAttribute("reftest-async-scroll")
+  ) {
+    return Promise.resolve(false);
+  }
 
-    let allowFailure = options.allowFailure;
-    let promise = content.windowGlobalChild.getActor("ReftestFission").sendQuery("SetupAsyncScrollOffsets", {allowFailure});
-    return promise.then(function(result) {
-        for (let errorString of result.errorStrings) {
-            LogError(errorString);
-        }
-        for (let infoString of result.infoStrings) {
-            LogInfo(infoString);
-        }
-        return result.updatedAny;
+  let allowFailure = options.allowFailure;
+  let promise = content.windowGlobalChild
+    .getActor("ReftestFission")
+    .sendQuery("SetupAsyncScrollOffsets", { allowFailure });
+  return promise.then(
+    function (result) {
+      for (let errorString of result.errorStrings) {
+        LogError(errorString);
+      }
+      for (let infoString of result.infoStrings) {
+        LogInfo(infoString);
+      }
+      return result.updatedAny;
     },
-    function(reason) {
-        LogError("SetupAsyncScrollOffsets SendQuery to parent promise rejected: " + reason);
-        return false;
-    });
+    function (reason) {
+      LogError(
+        "SetupAsyncScrollOffsets SendQuery to parent promise rejected: " +
+          reason
+      );
+      return false;
+    }
+  );
 }
 
 function setupAsyncZoom(options) {
-    var currentDoc = content.document;
-    var contentRootElement = currentDoc ? currentDoc.documentElement : null;
+  var currentDoc = content.document;
+  var contentRootElement = currentDoc ? currentDoc.documentElement : null;
 
-    if (!contentRootElement || !contentRootElement.hasAttribute('reftest-async-zoom'))
-        return false;
-
-    var zoom = attrOrDefault(contentRootElement, "reftest-async-zoom", 1);
-    if (zoom != 1) {
-        try {
-            windowUtils().setAsyncZoom(contentRootElement, zoom);
-            return true;
-        } catch (e) {
-            if (!options.allowFailure) {
-                throw e;
-            }
-        }
-    }
+  if (
+    !contentRootElement ||
+    !contentRootElement.hasAttribute("reftest-async-zoom")
+  )
     return false;
+
+  var zoom = attrOrDefault(contentRootElement, "reftest-async-zoom", 1);
+  if (zoom != 1) {
+    try {
+      windowUtils().setAsyncZoom(contentRootElement, zoom);
+      return true;
+    } catch (e) {
+      if (!options.allowFailure) {
+        throw e;
+      }
+    }
+  }
+  return false;
 }
 
-
 function resetDisplayportAndViewport() {
-    // XXX currently the displayport configuration lives on the
-    // presshell and so is "reset" on nav when we get a new presshell.
+  // XXX currently the displayport configuration lives on the
+  // presshell and so is "reset" on nav when we get a new presshell.
 }
 
 function shouldWaitForPendingPaints() {
-    // if gHaveCanvasSnapshot is false, we're not taking snapshots so
-    // there is no need to wait for pending paints to be flushed.
-    return gHaveCanvasSnapshot && windowUtils().isMozAfterPaintPending;
+  // if gHaveCanvasSnapshot is false, we're not taking snapshots so
+  // there is no need to wait for pending paints to be flushed.
+  return gHaveCanvasSnapshot && windowUtils().isMozAfterPaintPending;
 }
 
 function shouldWaitForReftestWaitRemoval(contentRootElement) {
-    // use getAttribute because className works differently in HTML and SVG
-    return contentRootElement &&
-           contentRootElement.hasAttribute('class') &&
-           contentRootElement.getAttribute('class').split(/\s+/)
-                             .includes("reftest-wait");
+  // use getAttribute because className works differently in HTML and SVG
+  return (
+    contentRootElement &&
+    contentRootElement.hasAttribute("class") &&
+    contentRootElement
+      .getAttribute("class")
+      .split(/\s+/)
+      .includes("reftest-wait")
+  );
 }
 
 function shouldSnapshotWholePage(contentRootElement) {
-    // use getAttribute because className works differently in HTML and SVG
-    return contentRootElement &&
-           contentRootElement.hasAttribute('class') &&
-           contentRootElement.getAttribute('class').split(/\s+/)
-                             .includes("reftest-snapshot-all");
+  // use getAttribute because className works differently in HTML and SVG
+  return (
+    contentRootElement &&
+    contentRootElement.hasAttribute("class") &&
+    contentRootElement
+      .getAttribute("class")
+      .split(/\s+/)
+      .includes("reftest-snapshot-all")
+  );
 }
 
 function shouldNotFlush(contentRootElement) {
-    // use getAttribute because className works differently in HTML and SVG
-    return contentRootElement &&
-           contentRootElement.hasAttribute('class') &&
-           contentRootElement.getAttribute('class').split(/\s+/)
-                             .includes("reftest-no-flush");
+  // use getAttribute because className works differently in HTML and SVG
+  return (
+    contentRootElement &&
+    contentRootElement.hasAttribute("class") &&
+    contentRootElement
+      .getAttribute("class")
+      .split(/\s+/)
+      .includes("reftest-no-flush")
+  );
 }
 
 function getNoPaintElements(contentRootElement) {
-    return contentRootElement.getElementsByClassName('reftest-no-paint');
+  return contentRootElement.getElementsByClassName("reftest-no-paint");
 }
 function getNoDisplayListElements(contentRootElement) {
-    return contentRootElement.getElementsByClassName('reftest-no-display-list');
+  return contentRootElement.getElementsByClassName("reftest-no-display-list");
 }
 function getDisplayListElements(contentRootElement) {
-    return contentRootElement.getElementsByClassName('reftest-display-list');
+  return contentRootElement.getElementsByClassName("reftest-display-list");
 }
 
 function getOpaqueLayerElements(contentRootElement) {
-    return contentRootElement.getElementsByClassName('reftest-opaque-layer');
+  return contentRootElement.getElementsByClassName("reftest-opaque-layer");
 }
 
 function getAssignedLayerMap(contentRootElement) {
-    var layerNameToElementsMap = {};
-    var elements = contentRootElement.querySelectorAll('[reftest-assigned-layer]');
-    for (var i = 0; i < elements.length; ++i) {
-        var element = elements[i];
-        var layerName = element.getAttribute('reftest-assigned-layer');
-        if (!(layerName in layerNameToElementsMap)) {
-            layerNameToElementsMap[layerName] = [];
-        }
-        layerNameToElementsMap[layerName].push(element);
+  var layerNameToElementsMap = {};
+  var elements = contentRootElement.querySelectorAll(
+    "[reftest-assigned-layer]"
+  );
+  for (var i = 0; i < elements.length; ++i) {
+    var element = elements[i];
+    var layerName = element.getAttribute("reftest-assigned-layer");
+    if (!(layerName in layerNameToElementsMap)) {
+      layerNameToElementsMap[layerName] = [];
     }
-    return layerNameToElementsMap;
+    layerNameToElementsMap[layerName].push(element);
+  }
+  return layerNameToElementsMap;
 }
 
 const FlushMode = {
   ALL: 0,
-  IGNORE_THROTTLED_ANIMATIONS: 1
+  IGNORE_THROTTLED_ANIMATIONS: 1,
 };
 
 // Initial state. When the document has loaded and all MozAfterPaint events and
@@ -422,1108 +461,1174 @@ const STATE_WAITING_TO_FINISH = 4;
 const STATE_COMPLETED = 5;
 
 async function FlushRendering(aFlushMode) {
-    let browsingContext = content.docShell.browsingContext;
-    let ignoreThrottledAnimations = (aFlushMode === FlushMode.IGNORE_THROTTLED_ANIMATIONS);
-    // Ensure the refresh driver ticks at least once, this ensures some
-    // preference changes take effect.
-    let needsAnimationFrame = IsSnapshottableTestType();
-    try {
-        let result = await content.windowGlobalChild.getActor("ReftestFission").sendQuery("FlushRendering", {browsingContext, ignoreThrottledAnimations, needsAnimationFrame});
-        for (let errorString of result.errorStrings) {
-            LogError(errorString);
-        }
-        for (let warningString of result.warningStrings) {
-            LogWarning(warningString);
-        }
-        for (let infoString of result.infoStrings) {
-            LogInfo(infoString);
-        }
-    } catch (reason) {
-        // We expect actors to go away causing sendQuery's to fail, so
-        // just note it.
-        LogInfo("FlushRendering sendQuery to parent rejected: " + reason);
+  let browsingContext = content.docShell.browsingContext;
+  let ignoreThrottledAnimations =
+    aFlushMode === FlushMode.IGNORE_THROTTLED_ANIMATIONS;
+  // Ensure the refresh driver ticks at least once, this ensures some
+  // preference changes take effect.
+  let needsAnimationFrame = IsSnapshottableTestType();
+  try {
+    let result = await content.windowGlobalChild
+      .getActor("ReftestFission")
+      .sendQuery("FlushRendering", {
+        browsingContext,
+        ignoreThrottledAnimations,
+        needsAnimationFrame,
+      });
+    for (let errorString of result.errorStrings) {
+      LogError(errorString);
     }
+    for (let warningString of result.warningStrings) {
+      LogWarning(warningString);
+    }
+    for (let infoString of result.infoStrings) {
+      LogInfo(infoString);
+    }
+  } catch (reason) {
+    // We expect actors to go away causing sendQuery's to fail, so
+    // just note it.
+    LogInfo("FlushRendering sendQuery to parent rejected: " + reason);
+  }
 }
 
-function WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements, forURL) {
-    // WaitForTestEnd works via the MakeProgress function below. It is responsible for
-    // moving through the states listed above and calling FlushRendering. We also listen
-    // for a number of events, the most important of which is the AfterPaintListener,
-    // which is responsible for updating the canvas after paints. In a fission world
-    // FlushRendering and updating the canvas must necessarily be async operations.
-    // During these async operations we want to wait for them to finish and we don't
-    // want to try to do anything else (what would we even want to do while only some of
-    // the processes involved have flushed layout or updated their layer trees?). So
-    // we call OperationInProgress whenever we are about to go back to the event loop
-    // during one of these calls, and OperationCompleted when it finishes. This prevents
-    // anything else from running while we wait and getting us into a confused state. We
-    // then record anything that happens while we are waiting to make sure that the
-    // right actions are triggered. The possible actions are basically calling
-    // MakeProgress from a setTimeout, and updating the canvas for an after paint event.
-    // The after paint listener just stashes the rects and we update them after a
-    // completed MakeProgress call. This is handled by
-    // HandlePendingTasksAfterMakeProgress, which also waits for any pending after paint
-    // events. The general sequence of events is:
-    //   - MakeProgress
-    //   - HandlePendingTasksAfterMakeProgress
-    //     - wait for after paint event if one is pending
-    //     - update canvas for after paint events we have received
-    //   - MakeProgress
-    //   etc
+function WaitForTestEnd(
+  contentRootElement,
+  inPrintMode,
+  spellCheckedElements,
+  forURL
+) {
+  // WaitForTestEnd works via the MakeProgress function below. It is responsible for
+  // moving through the states listed above and calling FlushRendering. We also listen
+  // for a number of events, the most important of which is the AfterPaintListener,
+  // which is responsible for updating the canvas after paints. In a fission world
+  // FlushRendering and updating the canvas must necessarily be async operations.
+  // During these async operations we want to wait for them to finish and we don't
+  // want to try to do anything else (what would we even want to do while only some of
+  // the processes involved have flushed layout or updated their layer trees?). So
+  // we call OperationInProgress whenever we are about to go back to the event loop
+  // during one of these calls, and OperationCompleted when it finishes. This prevents
+  // anything else from running while we wait and getting us into a confused state. We
+  // then record anything that happens while we are waiting to make sure that the
+  // right actions are triggered. The possible actions are basically calling
+  // MakeProgress from a setTimeout, and updating the canvas for an after paint event.
+  // The after paint listener just stashes the rects and we update them after a
+  // completed MakeProgress call. This is handled by
+  // HandlePendingTasksAfterMakeProgress, which also waits for any pending after paint
+  // events. The general sequence of events is:
+  //   - MakeProgress
+  //   - HandlePendingTasksAfterMakeProgress
+  //     - wait for after paint event if one is pending
+  //     - update canvas for after paint events we have received
+  //   - MakeProgress
+  //   etc
 
-    function CheckForLivenessOfContentRootElement() {
-        if (contentRootElement && Cu.isDeadWrapper(contentRootElement)) {
-            contentRootElement = null;
-        }
+  function CheckForLivenessOfContentRootElement() {
+    if (contentRootElement && Cu.isDeadWrapper(contentRootElement)) {
+      contentRootElement = null;
+    }
+  }
+
+  var setTimeoutCallMakeProgressWhenComplete = false;
+
+  var operationInProgress = false;
+  function OperationInProgress() {
+    if (operationInProgress != false) {
+      LogWarning("Nesting atomic operations?");
+    }
+    operationInProgress = true;
+  }
+  function OperationCompleted() {
+    if (operationInProgress != true) {
+      LogWarning("Mismatched OperationInProgress/OperationCompleted calls?");
+    }
+    operationInProgress = false;
+    if (setTimeoutCallMakeProgressWhenComplete) {
+      setTimeoutCallMakeProgressWhenComplete = false;
+      setTimeout(CallMakeProgress, 0);
+    }
+  }
+  function AssertNoOperationInProgress() {
+    if (operationInProgress) {
+      LogWarning("AssertNoOperationInProgress but operationInProgress");
+    }
+  }
+
+  var updateCanvasPending = false;
+  var updateCanvasRects = [];
+
+  var stopAfterPaintReceived = false;
+  var currentDoc = content.document;
+  var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT;
+
+  var setTimeoutMakeProgressPending = false;
+
+  function CallSetTimeoutMakeProgress() {
+    if (setTimeoutMakeProgressPending) {
+      return;
+    }
+    setTimeoutMakeProgressPending = true;
+    setTimeout(CallMakeProgress, 0);
+  }
+
+  // This should only ever be called from a timeout.
+  function CallMakeProgress() {
+    if (operationInProgress) {
+      setTimeoutCallMakeProgressWhenComplete = true;
+      return;
+    }
+    setTimeoutMakeProgressPending = false;
+    MakeProgress();
+  }
+
+  var waitingForAnAfterPaint = false;
+
+  // Updates the canvas if there are pending updates for it. Checks if we
+  // need to call MakeProgress.
+  function HandlePendingTasksAfterMakeProgress() {
+    AssertNoOperationInProgress();
+
+    if (
+      (state == STATE_WAITING_TO_FIRE_INVALIDATE_EVENT ||
+        state == STATE_WAITING_TO_FINISH) &&
+      shouldWaitForPendingPaints()
+    ) {
+      LogInfo(
+        "HandlePendingTasksAfterMakeProgress waiting for a MozAfterPaint"
+      );
+      // We are in a state where we wait for MozAfterPaint to clear and a
+      // MozAfterPaint event is pending, give it a chance to fire, but don't
+      // let anything else run.
+      waitingForAnAfterPaint = true;
+      OperationInProgress();
+      return;
     }
 
-    var setTimeoutCallMakeProgressWhenComplete = false;
-
-    var operationInProgress = false;
-    function OperationInProgress() {
-        if (operationInProgress != false) {
-            LogWarning("Nesting atomic operations?");
-        }
-        operationInProgress = true;
-    }
-    function OperationCompleted() {
-        if (operationInProgress != true) {
-            LogWarning("Mismatched OperationInProgress/OperationCompleted calls?");
-        }
-        operationInProgress = false;
-        if (setTimeoutCallMakeProgressWhenComplete) {
-            setTimeoutCallMakeProgressWhenComplete = false;
-            setTimeout(CallMakeProgress, 0);
-        }
-    }
-    function AssertNoOperationInProgress() {
-        if (operationInProgress) {
-            LogWarning("AssertNoOperationInProgress but operationInProgress");
-        }
-    }
-
-    var updateCanvasPending = false;
-    var updateCanvasRects = [];
-
-    var stopAfterPaintReceived = false;
-    var currentDoc = content.document;
-    var state = STATE_WAITING_TO_FIRE_INVALIDATE_EVENT;
-
-    var setTimeoutMakeProgressPending = false;
-
-    function CallSetTimeoutMakeProgress() {
-        if (setTimeoutMakeProgressPending) {
-            return;
-        }
-        setTimeoutMakeProgressPending = true;
-        setTimeout(CallMakeProgress, 0);
-    }
-
-    // This should only ever be called from a timeout.
-    function CallMakeProgress() {
-        if (operationInProgress) {
-            setTimeoutCallMakeProgressWhenComplete = true;
-            return;
-        }
-        setTimeoutMakeProgressPending = false;
-        MakeProgress();
-    }
-
-    var waitingForAnAfterPaint = false;
-
-    // Updates the canvas if there are pending updates for it. Checks if we
-    // need to call MakeProgress.
-    function HandlePendingTasksAfterMakeProgress() {
-        AssertNoOperationInProgress();
-
-        if ((state == STATE_WAITING_TO_FIRE_INVALIDATE_EVENT || state == STATE_WAITING_TO_FINISH) &&
-            shouldWaitForPendingPaints()) {
-            LogInfo("HandlePendingTasksAfterMakeProgress waiting for a MozAfterPaint");
-            // We are in a state where we wait for MozAfterPaint to clear and a
-            // MozAfterPaint event is pending, give it a chance to fire, but don't
-            // let anything else run.
-            waitingForAnAfterPaint = true;
-            OperationInProgress();
-            return;
-        }
-
-        if (updateCanvasPending) {
-            LogInfo("HandlePendingTasksAfterMakeProgress updating canvas");
-            updateCanvasPending = false;
-            let rects = updateCanvasRects;
-            updateCanvasRects = [];
-            OperationInProgress();
-            CheckForLivenessOfContentRootElement();
-            let promise = SendUpdateCanvasForEvent(forURL, rects, contentRootElement);
-            promise.then(function () {
-                OperationCompleted();
-                // After paint events are fired immediately after a paint (one
-                // of the things that can call us). Don't confuse ourselves by
-                // firing synchronously if we triggered the paint ourselves.
-                CallSetTimeoutMakeProgress();
-            });
-        }
-    }
-
-    // true if rectA contains rectB
-    function Contains(rectA, rectB) {
-        return (rectA.left <= rectB.left && rectB.right <= rectA.right && rectA.top <= rectB.top && rectB.bottom <= rectA.bottom);
-    }
-    // true if some rect in rectList contains rect
-    function ContainedIn(rectList, rect) {
-        for (let i = 0; i < rectList.length; ++i) {
-            if (Contains(rectList[i], rect)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function AfterPaintListener(event) {
-        LogInfo("AfterPaintListener in " + event.target.document.location.href);
-        if (event.target.document != currentDoc) {
-            // ignore paint events for subframes or old documents in the window.
-            // Invalidation in subframes will cause invalidation in the toplevel document anyway.
-            return;
-        }
-
-        updateCanvasPending = true;
-        for (let r of event.clientRects) {
-            if (ContainedIn(updateCanvasRects, r)) {
-                continue;
-            }
-
-            // Copy the rect; it's content and we are chrome, which means if the
-            // document goes away (and it can in some crashtests) our reference
-            // to it will be turned into a dead wrapper that we can't acccess.
-            updateCanvasRects.push({ left: r.left, top: r.top, right: r.right, bottom: r.bottom });
-        }
-
-        if (waitingForAnAfterPaint) {
-            waitingForAnAfterPaint = false;
-            OperationCompleted();
-        }
-
-        if (!operationInProgress) {
-            HandlePendingTasksAfterMakeProgress();
-        }
-        // Otherwise we know that eventually after the operation finishes we
-        // will get a MakeProgress and/or HandlePendingTasksAfterMakeProgress
-        // call, so we don't need to do anything.
-    }
-
-    function FromChildAfterPaintListener(event) {
-        LogInfo("FromChildAfterPaintListener from " + event.detail.originalTargetUri);
-
-        updateCanvasPending = true;
-        for (let r of event.detail.rects) {
-            if (ContainedIn(updateCanvasRects, r)) {
-                continue;
-            }
-
-            // Copy the rect; it's content and we are chrome, which means if the
-            // document goes away (and it can in some crashtests) our reference
-            // to it will be turned into a dead wrapper that we can't acccess.
-            updateCanvasRects.push({ left: r.left, top: r.top, right: r.right, bottom: r.bottom });
-        }
-
-        if (!operationInProgress) {
-            HandlePendingTasksAfterMakeProgress();
-        }
-        // Otherwise we know that eventually after the operation finishes we
-        // will get a MakeProgress and/or HandlePendingTasksAfterMakeProgress
-        // call, so we don't need to do anything.
-    }
-
-    let attrModifiedObserver;
-    function AttrModifiedListener() {
-        LogInfo("AttrModifiedListener fired");
-        // Wait for the next return-to-event-loop before continuing --- for
-        // example, the attribute may have been modified in an subdocument's
-        // load event handler, in which case we need load event processing
-        // to complete and unsuppress painting before we check isMozAfterPaintPending.
-        CallSetTimeoutMakeProgress();
-    }
-
-    function RemoveListeners() {
-        // OK, we can end the test now.
-        removeEventListener("MozAfterPaint", AfterPaintListener, false);
-        removeEventListener("Reftest:MozAfterPaintFromChild", FromChildAfterPaintListener, false);
-        CheckForLivenessOfContentRootElement();
-        if (attrModifiedObserver) {
-            if (!Cu.isDeadWrapper(attrModifiedObserver)) {
-                attrModifiedObserver.disconnect();
-            }
-            attrModifiedObserver = null;
-        }
-        gTimeoutHook = null;
-        // Make sure we're in the COMPLETED state just in case
-        // (this may be called via the test-timeout hook)
-        state = STATE_COMPLETED;
-    }
-
-    // Everything that could cause shouldWaitForXXX() to
-    // change from returning true to returning false is monitored via some kind
-    // of event listener which eventually calls this function.
-    function MakeProgress() {
-        if (state >= STATE_COMPLETED) {
-            LogInfo("MakeProgress: STATE_COMPLETED");
-            return;
-        }
-
-        LogInfo("MakeProgress");
-
-        // We don't need to flush styles any more when we are in the state
-        // after reftest-wait has removed.
-        OperationInProgress();
-        let promise = Promise.resolve(undefined);
-        if (state != STATE_WAITING_TO_FINISH) {
-          // If we are waiting for the MozReftestInvalidate event we don't want
-          // to flush throttled animations. Flushing throttled animations can
-          // continue to cause new MozAfterPaint events even when all the
-          // rendering we're concerned about should have ceased. Since
-          // MozReftestInvalidate won't be sent until we finish waiting for all
-          // MozAfterPaint events, we should avoid flushing throttled animations
-          // here or else we'll never leave this state.
-          flushMode = (state === STATE_WAITING_TO_FIRE_INVALIDATE_EVENT)
-                    ? FlushMode.IGNORE_THROTTLED_ANIMATIONS
-                    : FlushMode.ALL;
-          promise = FlushRendering(flushMode);
-        }
-        promise.then(function () {
-            OperationCompleted();
-            MakeProgress2();
-            // If there is an operation in progress then we know there will be
-            // a MakeProgress call is will happen after it finishes.
-            if (!operationInProgress) {
-                HandlePendingTasksAfterMakeProgress();
-            }
-        });
-    }
-
-    function MakeProgress2() {
-        switch (state) {
-        case STATE_WAITING_TO_FIRE_INVALIDATE_EVENT: {
-            LogInfo("MakeProgress: STATE_WAITING_TO_FIRE_INVALIDATE_EVENT");
-            if (shouldWaitForPendingPaints() || updateCanvasPending) {
-                gFailureReason = "timed out waiting for pending paint count to reach zero";
-                if (shouldWaitForPendingPaints()) {
-                    gFailureReason += " (waiting for MozAfterPaint)";
-                    LogInfo("MakeProgress: waiting for MozAfterPaint");
-                }
-                if (updateCanvasPending) {
-                    gFailureReason += " (waiting for updateCanvasPending)";
-                    LogInfo("MakeProgress: waiting for updateCanvasPending");
-                }
-                return;
-            }
-
-            state = STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL;
-            CheckForLivenessOfContentRootElement();
-            var hasReftestWait = shouldWaitForReftestWaitRemoval(contentRootElement);
-            // Notify the test document that now is a good time to test some invalidation
-            LogInfo("MakeProgress: dispatching MozReftestInvalidate");
-            if (contentRootElement) {
-                var elements = getNoPaintElements(contentRootElement);
-                for (var i = 0; i < elements.length; ++i) {
-                  windowUtils().checkAndClearPaintedState(elements[i]);
-                }
-                elements = getNoDisplayListElements(contentRootElement);
-                for (var i = 0; i < elements.length; ++i) {
-                  windowUtils().checkAndClearDisplayListState(elements[i]);
-                }
-                elements = getDisplayListElements(contentRootElement);
-                for (var i = 0; i < elements.length; ++i) {
-                  windowUtils().checkAndClearDisplayListState(elements[i]);
-                }
-                var notification = content.document.createEvent("Events");
-                notification.initEvent("MozReftestInvalidate", true, false);
-                contentRootElement.dispatchEvent(notification);
-            }
-
-            if (!inPrintMode && doPrintMode(contentRootElement)) {
-                LogInfo("MakeProgress: setting up print mode");
-                setupPrintMode(contentRootElement);
-            }
-
-            if (hasReftestWait && !shouldWaitForReftestWaitRemoval(contentRootElement)) {
-                // MozReftestInvalidate handler removed reftest-wait.
-                // We expect something to have been invalidated...
-                OperationInProgress();
-                let promise = FlushRendering(FlushMode.ALL);
-                promise.then(function () {
-                    OperationCompleted();
-                    if (!updateCanvasPending && !shouldWaitForPendingPaints()) {
-                        LogWarning("MozInvalidateEvent didn't invalidate");
-                    }
-                    MakeProgress();
-                });
-                return;
-            }
-            // Try next state
-            MakeProgress();
-            return;
-        }
-
-        case STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL:
-            LogInfo("MakeProgress: STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL");
-            CheckForLivenessOfContentRootElement();
-            if (shouldWaitForReftestWaitRemoval(contentRootElement)) {
-                gFailureReason = "timed out waiting for reftest-wait to be removed";
-                LogInfo("MakeProgress: waiting for reftest-wait to be removed");
-                return;
-            }
-
-            if (shouldNotFlush(contentRootElement)) {
-              // If reftest-no-flush is specified, we need to set
-              // updateCanvasPending explicitly to take the latest snapshot
-              // since animation changes on the compositor thread don't invoke
-              // any MozAfterPaint events at all.
-              // NOTE: We don't add any rects to updateCanvasRects here since
-              // SendUpdateCanvasForEvent() will handle this case properly
-              // without any rects.
-              updateCanvasPending = true;
-            }
-            // Try next state
-            state = STATE_WAITING_FOR_SPELL_CHECKS;
-            MakeProgress();
-            return;
-
-        case STATE_WAITING_FOR_SPELL_CHECKS:
-            LogInfo("MakeProgress: STATE_WAITING_FOR_SPELL_CHECKS");
-            if (numPendingSpellChecks) {
-                gFailureReason = "timed out waiting for spell checks to end";
-                LogInfo("MakeProgress: waiting for spell checks to end");
-                return;
-            }
-
-            state = STATE_WAITING_FOR_APZ_FLUSH;
-            LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
-            gFailureReason = "timed out waiting for APZ flush to complete";
-
-            var os = Cc[NS_OBSERVER_SERVICE_CONTRACTID].getService(Ci.nsIObserverService);
-            var flushWaiter = function(aSubject, aTopic, aData) {
-                if (aTopic) LogInfo("MakeProgress: apz-repaints-flushed fired");
-                os.removeObserver(flushWaiter, "apz-repaints-flushed");
-                state = STATE_WAITING_TO_FINISH;
-                if (operationInProgress) {
-                    CallSetTimeoutMakeProgress();
-                } else {
-                    MakeProgress();
-                }
-            };
-            os.addObserver(flushWaiter, "apz-repaints-flushed");
-
-            var willSnapshot = IsSnapshottableTestType();
-            CheckForLivenessOfContentRootElement();
-            var noFlush = !shouldNotFlush(contentRootElement);
-            if (noFlush && willSnapshot && windowUtils().flushApzRepaints()) {
-                LogInfo("MakeProgress: done requesting APZ flush");
-            } else {
-                LogInfo("MakeProgress: APZ flush not required");
-                flushWaiter(null, null, null);
-            }
-            return;
-
-        case STATE_WAITING_FOR_APZ_FLUSH:
-            LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
-            // Nothing to do here; once we get the apz-repaints-flushed event
-            // we will go to STATE_WAITING_TO_FINISH
-            return;
-
-        case STATE_WAITING_TO_FINISH:
-            LogInfo("MakeProgress: STATE_WAITING_TO_FINISH");
-            if (shouldWaitForPendingPaints() || updateCanvasPending) {
-                gFailureReason = "timed out waiting for pending paint count to " +
-                    "reach zero (after reftest-wait removed and switch to print mode)";
-                if (shouldWaitForPendingPaints()) {
-                    gFailureReason += " (waiting for MozAfterPaint)";
-                    LogInfo("MakeProgress: waiting for MozAfterPaint");
-                }
-                if (updateCanvasPending) {
-                    gFailureReason += " (waiting for updateCanvasPending)";
-                    LogInfo("MakeProgress: waiting for updateCanvasPending");
-                }
-                return;
-            }
-            CheckForLivenessOfContentRootElement();
-            if (contentRootElement) {
-              var elements = getNoPaintElements(contentRootElement);
-              for (var i = 0; i < elements.length; ++i) {
-                  if (windowUtils().checkAndClearPaintedState(elements[i])) {
-                      SendFailedNoPaint();
-                  }
-              }
-              // We only support retained display lists in the content process
-              // right now, so don't fail reftest-no-display-list tests when
-              // we don't have e10s.
-              if (gBrowserIsRemote) {
-                elements = getNoDisplayListElements(contentRootElement);
-                for (var i = 0; i < elements.length; ++i) {
-                    if (windowUtils().checkAndClearDisplayListState(elements[i])) {
-                        SendFailedNoDisplayList();
-                    }
-                }
-                elements = getDisplayListElements(contentRootElement);
-                for (var i = 0; i < elements.length; ++i) {
-                    if (!windowUtils().checkAndClearDisplayListState(elements[i])) {
-                        SendFailedDisplayList();
-                    }
-                }
-              }
-            }
-
-            if (!IsSnapshottableTestType()) {
-              // If we're not snapshotting the test, at least do a sync round-trip
-              // to the compositor to ensure that all the rendering messages
-              // related to this test get processed. Otherwise problems triggered
-              // by this test may only manifest as failures in a later test.
-              LogInfo("MakeProgress: Doing sync flush to compositor");
-              gFailureReason = "timed out while waiting for sync compositor flush"
-              windowUtils().syncFlushCompositor();
-            }
-
-            LogInfo("MakeProgress: Completed");
-            state = STATE_COMPLETED;
-            gFailureReason = "timed out while taking snapshot (bug in harness?)";
-            RemoveListeners();
-            CheckForLivenessOfContentRootElement();
-            CheckForProcessCrashExpectation(contentRootElement);
-            setTimeout(RecordResult, 0, forURL);
-            return;
-        }
-    }
-
-    LogInfo("WaitForTestEnd: Adding listeners");
-    addEventListener("MozAfterPaint", AfterPaintListener, false);
-    addEventListener("Reftest:MozAfterPaintFromChild", FromChildAfterPaintListener, false);
-
-    // If contentRootElement is null then shouldWaitForReftestWaitRemoval will
-    // always return false so we don't need a listener anyway
-    CheckForLivenessOfContentRootElement();
-    if (contentRootElement?.hasAttribute("class")) {
-      attrModifiedObserver =
-        new contentRootElement.ownerDocument.defaultView.MutationObserver(AttrModifiedListener);
-      attrModifiedObserver.observe(contentRootElement, {attributes: true});
-    }
-    gTimeoutHook = RemoveListeners;
-
-    // Listen for spell checks on spell-checked elements.
-    var numPendingSpellChecks = spellCheckedElements.length;
-    function decNumPendingSpellChecks() {
-        --numPendingSpellChecks;
-        if (operationInProgress) {
-            CallSetTimeoutMakeProgress();
-        } else {
-            MakeProgress();
-        }
-    }
-    for (let editable of spellCheckedElements) {
-        try {
-            onSpellCheck(editable, decNumPendingSpellChecks);
-        } catch (err) {
-            // The element may not have an editor, so ignore it.
-            setTimeout(decNumPendingSpellChecks, 0);
-        }
-    }
-
-    // Take a full snapshot now that all our listeners are set up. This
-    // ensures it's impossible for us to miss updates between taking the snapshot
-    // and adding our listeners.
-    OperationInProgress();
-    let promise = SendInitCanvasWithSnapshot(forURL);
-    promise.then(function () {
+    if (updateCanvasPending) {
+      LogInfo("HandlePendingTasksAfterMakeProgress updating canvas");
+      updateCanvasPending = false;
+      let rects = updateCanvasRects;
+      updateCanvasRects = [];
+      OperationInProgress();
+      CheckForLivenessOfContentRootElement();
+      let promise = SendUpdateCanvasForEvent(forURL, rects, contentRootElement);
+      promise.then(function () {
         OperationCompleted();
-        MakeProgress();
+        // After paint events are fired immediately after a paint (one
+        // of the things that can call us). Don't confuse ourselves by
+        // firing synchronously if we triggered the paint ourselves.
+        CallSetTimeoutMakeProgress();
+      });
+    }
+  }
+
+  // true if rectA contains rectB
+  function Contains(rectA, rectB) {
+    return (
+      rectA.left <= rectB.left &&
+      rectB.right <= rectA.right &&
+      rectA.top <= rectB.top &&
+      rectB.bottom <= rectA.bottom
+    );
+  }
+  // true if some rect in rectList contains rect
+  function ContainedIn(rectList, rect) {
+    for (let i = 0; i < rectList.length; ++i) {
+      if (Contains(rectList[i], rect)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  function AfterPaintListener(event) {
+    LogInfo("AfterPaintListener in " + event.target.document.location.href);
+    if (event.target.document != currentDoc) {
+      // ignore paint events for subframes or old documents in the window.
+      // Invalidation in subframes will cause invalidation in the toplevel document anyway.
+      return;
+    }
+
+    updateCanvasPending = true;
+    for (let r of event.clientRects) {
+      if (ContainedIn(updateCanvasRects, r)) {
+        continue;
+      }
+
+      // Copy the rect; it's content and we are chrome, which means if the
+      // document goes away (and it can in some crashtests) our reference
+      // to it will be turned into a dead wrapper that we can't acccess.
+      updateCanvasRects.push({
+        left: r.left,
+        top: r.top,
+        right: r.right,
+        bottom: r.bottom,
+      });
+    }
+
+    if (waitingForAnAfterPaint) {
+      waitingForAnAfterPaint = false;
+      OperationCompleted();
+    }
+
+    if (!operationInProgress) {
+      HandlePendingTasksAfterMakeProgress();
+    }
+    // Otherwise we know that eventually after the operation finishes we
+    // will get a MakeProgress and/or HandlePendingTasksAfterMakeProgress
+    // call, so we don't need to do anything.
+  }
+
+  function FromChildAfterPaintListener(event) {
+    LogInfo(
+      "FromChildAfterPaintListener from " + event.detail.originalTargetUri
+    );
+
+    updateCanvasPending = true;
+    for (let r of event.detail.rects) {
+      if (ContainedIn(updateCanvasRects, r)) {
+        continue;
+      }
+
+      // Copy the rect; it's content and we are chrome, which means if the
+      // document goes away (and it can in some crashtests) our reference
+      // to it will be turned into a dead wrapper that we can't acccess.
+      updateCanvasRects.push({
+        left: r.left,
+        top: r.top,
+        right: r.right,
+        bottom: r.bottom,
+      });
+    }
+
+    if (!operationInProgress) {
+      HandlePendingTasksAfterMakeProgress();
+    }
+    // Otherwise we know that eventually after the operation finishes we
+    // will get a MakeProgress and/or HandlePendingTasksAfterMakeProgress
+    // call, so we don't need to do anything.
+  }
+
+  let attrModifiedObserver;
+  function AttrModifiedListener() {
+    LogInfo("AttrModifiedListener fired");
+    // Wait for the next return-to-event-loop before continuing --- for
+    // example, the attribute may have been modified in an subdocument's
+    // load event handler, in which case we need load event processing
+    // to complete and unsuppress painting before we check isMozAfterPaintPending.
+    CallSetTimeoutMakeProgress();
+  }
+
+  function RemoveListeners() {
+    // OK, we can end the test now.
+    removeEventListener("MozAfterPaint", AfterPaintListener, false);
+    removeEventListener(
+      "Reftest:MozAfterPaintFromChild",
+      FromChildAfterPaintListener,
+      false
+    );
+    CheckForLivenessOfContentRootElement();
+    if (attrModifiedObserver) {
+      if (!Cu.isDeadWrapper(attrModifiedObserver)) {
+        attrModifiedObserver.disconnect();
+      }
+      attrModifiedObserver = null;
+    }
+    gTimeoutHook = null;
+    // Make sure we're in the COMPLETED state just in case
+    // (this may be called via the test-timeout hook)
+    state = STATE_COMPLETED;
+  }
+
+  // Everything that could cause shouldWaitForXXX() to
+  // change from returning true to returning false is monitored via some kind
+  // of event listener which eventually calls this function.
+  function MakeProgress() {
+    if (state >= STATE_COMPLETED) {
+      LogInfo("MakeProgress: STATE_COMPLETED");
+      return;
+    }
+
+    LogInfo("MakeProgress");
+
+    // We don't need to flush styles any more when we are in the state
+    // after reftest-wait has removed.
+    OperationInProgress();
+    let promise = Promise.resolve(undefined);
+    if (state != STATE_WAITING_TO_FINISH) {
+      // If we are waiting for the MozReftestInvalidate event we don't want
+      // to flush throttled animations. Flushing throttled animations can
+      // continue to cause new MozAfterPaint events even when all the
+      // rendering we're concerned about should have ceased. Since
+      // MozReftestInvalidate won't be sent until we finish waiting for all
+      // MozAfterPaint events, we should avoid flushing throttled animations
+      // here or else we'll never leave this state.
+      flushMode =
+        state === STATE_WAITING_TO_FIRE_INVALIDATE_EVENT
+          ? FlushMode.IGNORE_THROTTLED_ANIMATIONS
+          : FlushMode.ALL;
+      promise = FlushRendering(flushMode);
+    }
+    promise.then(function () {
+      OperationCompleted();
+      MakeProgress2();
+      // If there is an operation in progress then we know there will be
+      // a MakeProgress call is will happen after it finishes.
+      if (!operationInProgress) {
+        HandlePendingTasksAfterMakeProgress();
+      }
     });
-}
+  }
 
-async function OnDocumentLoad(uri)
-{
-    if (gClearingForAssertionCheck) {
-        if (uri == BLANK_URL_FOR_CLEARING) {
-            DoAssertionCheck();
-            return;
+  function MakeProgress2() {
+    switch (state) {
+      case STATE_WAITING_TO_FIRE_INVALIDATE_EVENT: {
+        LogInfo("MakeProgress: STATE_WAITING_TO_FIRE_INVALIDATE_EVENT");
+        if (shouldWaitForPendingPaints() || updateCanvasPending) {
+          gFailureReason =
+            "timed out waiting for pending paint count to reach zero";
+          if (shouldWaitForPendingPaints()) {
+            gFailureReason += " (waiting for MozAfterPaint)";
+            LogInfo("MakeProgress: waiting for MozAfterPaint");
+          }
+          if (updateCanvasPending) {
+            gFailureReason += " (waiting for updateCanvasPending)";
+            LogInfo("MakeProgress: waiting for updateCanvasPending");
+          }
+          return;
         }
 
-        // It's likely the previous test document reloads itself and causes the
-        // attempt of loading blank page fails. In this case we should retry
-        // loading the blank page.
-        LogInfo("Retry loading a blank page");
-        setTimeout(LoadURI, 0, BLANK_URL_FOR_CLEARING);
-        return;
-    }
-
-    if (uri != gCurrentURL) {
-        LogInfo("OnDocumentLoad fired for previous document");
-        // Ignore load events for previous documents.
-        return;
-    }
-
-    var currentDoc = content && content.document;
-
-    // Collect all editable, spell-checked elements.  It may be the case that
-    // not all the elements that match this selector will be spell checked: for
-    // example, a textarea without a spellcheck attribute may have a parent with
-    // spellcheck=false, or script may set spellcheck=false on an element whose
-    // markup sets it to true.  But that's OK since onSpellCheck detects the
-    // absence of spell checking, too.
-    var querySelector =
-        '*[class~="spell-checked"],' +
-        'textarea:not([spellcheck="false"]),' +
-        'input[spellcheck]:-moz-any([spellcheck=""],[spellcheck="true"]),' +
-        '*[contenteditable]:-moz-any([contenteditable=""],[contenteditable="true"])';
-    var spellCheckedElements = currentDoc ? currentDoc.querySelectorAll(querySelector) : [];
-
-    var contentRootElement = currentDoc ? currentDoc.documentElement : null;
-    currentDoc = null;
-    setupFullZoom(contentRootElement);
-    setupTextZoom(contentRootElement);
-    setupViewport(contentRootElement);
-    await setupDisplayport(contentRootElement);
-    var inPrintMode = false;
-
-    async function AfterOnLoadScripts() {
-        // Regrab the root element, because the document may have changed.
-        var contentRootElement =
-          content.document ? content.document.documentElement : null;
-
-        // Flush the document in case it got modified in a load event handler.
-        await FlushRendering(FlushMode.ALL);
-
-        // Take a snapshot now.
-        let painted = await SendInitCanvasWithSnapshot(uri);
-
-        if (contentRootElement && Cu.isDeadWrapper(contentRootElement)) {
-            contentRootElement = null;
+        state = STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL;
+        CheckForLivenessOfContentRootElement();
+        var hasReftestWait =
+          shouldWaitForReftestWaitRemoval(contentRootElement);
+        // Notify the test document that now is a good time to test some invalidation
+        LogInfo("MakeProgress: dispatching MozReftestInvalidate");
+        if (contentRootElement) {
+          var elements = getNoPaintElements(contentRootElement);
+          for (var i = 0; i < elements.length; ++i) {
+            windowUtils().checkAndClearPaintedState(elements[i]);
+          }
+          elements = getNoDisplayListElements(contentRootElement);
+          for (var i = 0; i < elements.length; ++i) {
+            windowUtils().checkAndClearDisplayListState(elements[i]);
+          }
+          elements = getDisplayListElements(contentRootElement);
+          for (var i = 0; i < elements.length; ++i) {
+            windowUtils().checkAndClearDisplayListState(elements[i]);
+          }
+          var notification = content.document.createEvent("Events");
+          notification.initEvent("MozReftestInvalidate", true, false);
+          contentRootElement.dispatchEvent(notification);
         }
 
-        if (!inPrintMode && doPrintMode(contentRootElement) ||
-            // If we didn't force a paint above, in
-            // InitCurrentCanvasWithSnapshot, so we should wait for a
-            // paint before we consider them done.
-            !painted) {
-            LogInfo("AfterOnLoadScripts belatedly entering WaitForTestEnd");
-            // Go into reftest-wait mode belatedly.
-            WaitForTestEnd(contentRootElement, inPrintMode, [], uri);
-        } else {
-            CheckForProcessCrashExpectation(contentRootElement);
-            RecordResult(uri);
-        }
-    }
-
-    if (shouldWaitForReftestWaitRemoval(contentRootElement) ||
-        spellCheckedElements.length) {
-        // Go into reftest-wait mode immediately after painting has been
-        // unsuppressed, after the onload event has finished dispatching.
-        gFailureReason = "timed out waiting for test to complete (trying to get into WaitForTestEnd)";
-        LogInfo("OnDocumentLoad triggering WaitForTestEnd");
-        setTimeout(function () { WaitForTestEnd(contentRootElement, inPrintMode, spellCheckedElements, uri); }, 0);
-    } else {
-        if (doPrintMode(contentRootElement)) {
-            LogInfo("OnDocumentLoad setting up print mode");
-            setupPrintMode(contentRootElement);
-            inPrintMode = true;
+        if (!inPrintMode && doPrintMode(contentRootElement)) {
+          LogInfo("MakeProgress: setting up print mode");
+          setupPrintMode(contentRootElement);
         }
 
-        // Since we can't use a bubbling-phase load listener from chrome,
-        // this is a capturing phase listener.  So do setTimeout twice, the
-        // first to get us after the onload has fired in the content, and
-        // the second to get us after any setTimeout(foo, 0) in the content.
-        gFailureReason = "timed out waiting for test to complete (waiting for onload scripts to complete)";
-        LogInfo("OnDocumentLoad triggering AfterOnLoadScripts");
-        setTimeout(function () { setTimeout(AfterOnLoadScripts, 0); }, 0);
-    }
-}
-
-function CheckForProcessCrashExpectation(contentRootElement)
-{
-    if (contentRootElement &&
-        contentRootElement.hasAttribute('class') &&
-        contentRootElement.getAttribute('class').split(/\s+/)
-                          .includes("reftest-expect-process-crash")) {
-        SendExpectProcessCrash();
-    }
-}
-
-async function RecordResult(forURL)
-{
-    if (forURL != gCurrentURL) {
-        LogInfo("RecordResult fired for previous document");
-        return;
-    }
-
-    if (gCurrentURLRecordResults > 0) {
-        LogInfo("RecordResult fired extra times");
-        FinishTestItem();
-        return;
-    }
-    gCurrentURLRecordResults++;
-
-    LogInfo("RecordResult fired");
-
-    var currentTestRunTime = Date.now() - gCurrentTestStartTime;
-
-    clearTimeout(gFailureTimeout);
-    gFailureReason = null;
-    gFailureTimeout = null;
-    gCurrentURL = null;
-    gCurrentURLTargetType = undefined;
-
-    if (gCurrentTestType == TYPE_PRINT) {
-        printToPdf();
-        return;
-    }
-    if (gCurrentTestType == TYPE_SCRIPT) {
-        var error = '';
-        var testwindow = content;
-
-        if (testwindow.wrappedJSObject)
-            testwindow = testwindow.wrappedJSObject;
-
-        var testcases;
-        if (!testwindow.getTestCases || typeof testwindow.getTestCases != "function") {
-            // Force an unexpected failure to alert the test author to fix the test.
-            error = "test must provide a function getTestCases(). (SCRIPT)\n";
-        }
-        else if (!(testcases = testwindow.getTestCases())) {
-            // Force an unexpected failure to alert the test author to fix the test.
-            error = "test's getTestCases() must return an Array-like Object. (SCRIPT)\n";
-        }
-        else if (testcases.length == 0) {
-            // This failure may be due to a JavaScript Engine bug causing
-            // early termination of the test. If we do not allow silent
-            // failure, the driver will report an error.
-        }
-
-        var results = [ ];
-        if (!error) {
-            // FIXME/bug 618176: temporary workaround
-            for (var i = 0; i < testcases.length; ++i) {
-                var test = testcases[i];
-                results.push({ passed: test.testPassed(),
-                               description: test.testDescription() });
+        if (
+          hasReftestWait &&
+          !shouldWaitForReftestWaitRemoval(contentRootElement)
+        ) {
+          // MozReftestInvalidate handler removed reftest-wait.
+          // We expect something to have been invalidated...
+          OperationInProgress();
+          let promise = FlushRendering(FlushMode.ALL);
+          promise.then(function () {
+            OperationCompleted();
+            if (!updateCanvasPending && !shouldWaitForPendingPaints()) {
+              LogWarning("MozInvalidateEvent didn't invalidate");
             }
-            //results = testcases.map(function(test) {
-            //        return { passed: test.testPassed(),
-            //                 description: test.testDescription() };
+            MakeProgress();
+          });
+          return;
+        }
+        // Try next state
+        MakeProgress();
+        return;
+      }
+
+      case STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL:
+        LogInfo("MakeProgress: STATE_WAITING_FOR_REFTEST_WAIT_REMOVAL");
+        CheckForLivenessOfContentRootElement();
+        if (shouldWaitForReftestWaitRemoval(contentRootElement)) {
+          gFailureReason = "timed out waiting for reftest-wait to be removed";
+          LogInfo("MakeProgress: waiting for reftest-wait to be removed");
+          return;
         }
 
-        SendScriptResults(currentTestRunTime, error, results);
-        FinishTestItem();
+        if (shouldNotFlush(contentRootElement)) {
+          // If reftest-no-flush is specified, we need to set
+          // updateCanvasPending explicitly to take the latest snapshot
+          // since animation changes on the compositor thread don't invoke
+          // any MozAfterPaint events at all.
+          // NOTE: We don't add any rects to updateCanvasRects here since
+          // SendUpdateCanvasForEvent() will handle this case properly
+          // without any rects.
+          updateCanvasPending = true;
+        }
+        // Try next state
+        state = STATE_WAITING_FOR_SPELL_CHECKS;
+        MakeProgress();
+        return;
+
+      case STATE_WAITING_FOR_SPELL_CHECKS:
+        LogInfo("MakeProgress: STATE_WAITING_FOR_SPELL_CHECKS");
+        if (numPendingSpellChecks) {
+          gFailureReason = "timed out waiting for spell checks to end";
+          LogInfo("MakeProgress: waiting for spell checks to end");
+          return;
+        }
+
+        state = STATE_WAITING_FOR_APZ_FLUSH;
+        LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
+        gFailureReason = "timed out waiting for APZ flush to complete";
+
+        var os = Cc[NS_OBSERVER_SERVICE_CONTRACTID].getService(
+          Ci.nsIObserverService
+        );
+        var flushWaiter = function (aSubject, aTopic, aData) {
+          if (aTopic) LogInfo("MakeProgress: apz-repaints-flushed fired");
+          os.removeObserver(flushWaiter, "apz-repaints-flushed");
+          state = STATE_WAITING_TO_FINISH;
+          if (operationInProgress) {
+            CallSetTimeoutMakeProgress();
+          } else {
+            MakeProgress();
+          }
+        };
+        os.addObserver(flushWaiter, "apz-repaints-flushed");
+
+        var willSnapshot = IsSnapshottableTestType();
+        CheckForLivenessOfContentRootElement();
+        var noFlush = !shouldNotFlush(contentRootElement);
+        if (noFlush && willSnapshot && windowUtils().flushApzRepaints()) {
+          LogInfo("MakeProgress: done requesting APZ flush");
+        } else {
+          LogInfo("MakeProgress: APZ flush not required");
+          flushWaiter(null, null, null);
+        }
+        return;
+
+      case STATE_WAITING_FOR_APZ_FLUSH:
+        LogInfo("MakeProgress: STATE_WAITING_FOR_APZ_FLUSH");
+        // Nothing to do here; once we get the apz-repaints-flushed event
+        // we will go to STATE_WAITING_TO_FINISH
+        return;
+
+      case STATE_WAITING_TO_FINISH:
+        LogInfo("MakeProgress: STATE_WAITING_TO_FINISH");
+        if (shouldWaitForPendingPaints() || updateCanvasPending) {
+          gFailureReason =
+            "timed out waiting for pending paint count to " +
+            "reach zero (after reftest-wait removed and switch to print mode)";
+          if (shouldWaitForPendingPaints()) {
+            gFailureReason += " (waiting for MozAfterPaint)";
+            LogInfo("MakeProgress: waiting for MozAfterPaint");
+          }
+          if (updateCanvasPending) {
+            gFailureReason += " (waiting for updateCanvasPending)";
+            LogInfo("MakeProgress: waiting for updateCanvasPending");
+          }
+          return;
+        }
+        CheckForLivenessOfContentRootElement();
+        if (contentRootElement) {
+          var elements = getNoPaintElements(contentRootElement);
+          for (var i = 0; i < elements.length; ++i) {
+            if (windowUtils().checkAndClearPaintedState(elements[i])) {
+              SendFailedNoPaint();
+            }
+          }
+          // We only support retained display lists in the content process
+          // right now, so don't fail reftest-no-display-list tests when
+          // we don't have e10s.
+          if (gBrowserIsRemote) {
+            elements = getNoDisplayListElements(contentRootElement);
+            for (var i = 0; i < elements.length; ++i) {
+              if (windowUtils().checkAndClearDisplayListState(elements[i])) {
+                SendFailedNoDisplayList();
+              }
+            }
+            elements = getDisplayListElements(contentRootElement);
+            for (var i = 0; i < elements.length; ++i) {
+              if (!windowUtils().checkAndClearDisplayListState(elements[i])) {
+                SendFailedDisplayList();
+              }
+            }
+          }
+        }
+
+        if (!IsSnapshottableTestType()) {
+          // If we're not snapshotting the test, at least do a sync round-trip
+          // to the compositor to ensure that all the rendering messages
+          // related to this test get processed. Otherwise problems triggered
+          // by this test may only manifest as failures in a later test.
+          LogInfo("MakeProgress: Doing sync flush to compositor");
+          gFailureReason = "timed out while waiting for sync compositor flush";
+          windowUtils().syncFlushCompositor();
+        }
+
+        LogInfo("MakeProgress: Completed");
+        state = STATE_COMPLETED;
+        gFailureReason = "timed out while taking snapshot (bug in harness?)";
+        RemoveListeners();
+        CheckForLivenessOfContentRootElement();
+        CheckForProcessCrashExpectation(contentRootElement);
+        setTimeout(RecordResult, 0, forURL);
         return;
     }
+  }
 
-    // Setup async scroll offsets now in case SynchronizeForSnapshot is not
-    // called (due to reftest-no-sync-layers being supplied, or in the single
-    // process case).
-    let changedAsyncScrollZoom = await setupAsyncScrollOffsets({allowFailure:true});
-    if (setupAsyncZoom({allowFailure:true})) {
-        changedAsyncScrollZoom = true;
+  LogInfo("WaitForTestEnd: Adding listeners");
+  addEventListener("MozAfterPaint", AfterPaintListener, false);
+  addEventListener(
+    "Reftest:MozAfterPaintFromChild",
+    FromChildAfterPaintListener,
+    false
+  );
+
+  // If contentRootElement is null then shouldWaitForReftestWaitRemoval will
+  // always return false so we don't need a listener anyway
+  CheckForLivenessOfContentRootElement();
+  if (contentRootElement?.hasAttribute("class")) {
+    attrModifiedObserver =
+      new contentRootElement.ownerDocument.defaultView.MutationObserver(
+        AttrModifiedListener
+      );
+    attrModifiedObserver.observe(contentRootElement, { attributes: true });
+  }
+  gTimeoutHook = RemoveListeners;
+
+  // Listen for spell checks on spell-checked elements.
+  var numPendingSpellChecks = spellCheckedElements.length;
+  function decNumPendingSpellChecks() {
+    --numPendingSpellChecks;
+    if (operationInProgress) {
+      CallSetTimeoutMakeProgress();
+    } else {
+      MakeProgress();
     }
-    if (changedAsyncScrollZoom && !gBrowserIsRemote) {
-        sendAsyncMessage("reftest:UpdateWholeCanvasForInvalidation");
+  }
+  for (let editable of spellCheckedElements) {
+    try {
+      onSpellCheck(editable, decNumPendingSpellChecks);
+    } catch (err) {
+      // The element may not have an editor, so ignore it.
+      setTimeout(decNumPendingSpellChecks, 0);
+    }
+  }
+
+  // Take a full snapshot now that all our listeners are set up. This
+  // ensures it's impossible for us to miss updates between taking the snapshot
+  // and adding our listeners.
+  OperationInProgress();
+  let promise = SendInitCanvasWithSnapshot(forURL);
+  promise.then(function () {
+    OperationCompleted();
+    MakeProgress();
+  });
+}
+
+async function OnDocumentLoad(uri) {
+  if (gClearingForAssertionCheck) {
+    if (uri == BLANK_URL_FOR_CLEARING) {
+      DoAssertionCheck();
+      return;
     }
 
-    SendTestDone(currentTestRunTime);
+    // It's likely the previous test document reloads itself and causes the
+    // attempt of loading blank page fails. In this case we should retry
+    // loading the blank page.
+    LogInfo("Retry loading a blank page");
+    setTimeout(LoadURI, 0, BLANK_URL_FOR_CLEARING);
+    return;
+  }
+
+  if (uri != gCurrentURL) {
+    LogInfo("OnDocumentLoad fired for previous document");
+    // Ignore load events for previous documents.
+    return;
+  }
+
+  var currentDoc = content && content.document;
+
+  // Collect all editable, spell-checked elements.  It may be the case that
+  // not all the elements that match this selector will be spell checked: for
+  // example, a textarea without a spellcheck attribute may have a parent with
+  // spellcheck=false, or script may set spellcheck=false on an element whose
+  // markup sets it to true.  But that's OK since onSpellCheck detects the
+  // absence of spell checking, too.
+  var querySelector =
+    '*[class~="spell-checked"],' +
+    'textarea:not([spellcheck="false"]),' +
+    'input[spellcheck]:-moz-any([spellcheck=""],[spellcheck="true"]),' +
+    '*[contenteditable]:-moz-any([contenteditable=""],[contenteditable="true"])';
+  var spellCheckedElements = currentDoc
+    ? currentDoc.querySelectorAll(querySelector)
+    : [];
+
+  var contentRootElement = currentDoc ? currentDoc.documentElement : null;
+  currentDoc = null;
+  setupFullZoom(contentRootElement);
+  setupTextZoom(contentRootElement);
+  setupViewport(contentRootElement);
+  await setupDisplayport(contentRootElement);
+  var inPrintMode = false;
+
+  async function AfterOnLoadScripts() {
+    // Regrab the root element, because the document may have changed.
+    var contentRootElement = content.document
+      ? content.document.documentElement
+      : null;
+
+    // Flush the document in case it got modified in a load event handler.
+    await FlushRendering(FlushMode.ALL);
+
+    // Take a snapshot now.
+    let painted = await SendInitCanvasWithSnapshot(uri);
+
+    if (contentRootElement && Cu.isDeadWrapper(contentRootElement)) {
+      contentRootElement = null;
+    }
+
+    if (
+      (!inPrintMode && doPrintMode(contentRootElement)) ||
+      // If we didn't force a paint above, in
+      // InitCurrentCanvasWithSnapshot, so we should wait for a
+      // paint before we consider them done.
+      !painted
+    ) {
+      LogInfo("AfterOnLoadScripts belatedly entering WaitForTestEnd");
+      // Go into reftest-wait mode belatedly.
+      WaitForTestEnd(contentRootElement, inPrintMode, [], uri);
+    } else {
+      CheckForProcessCrashExpectation(contentRootElement);
+      RecordResult(uri);
+    }
+  }
+
+  if (
+    shouldWaitForReftestWaitRemoval(contentRootElement) ||
+    spellCheckedElements.length
+  ) {
+    // Go into reftest-wait mode immediately after painting has been
+    // unsuppressed, after the onload event has finished dispatching.
+    gFailureReason =
+      "timed out waiting for test to complete (trying to get into WaitForTestEnd)";
+    LogInfo("OnDocumentLoad triggering WaitForTestEnd");
+    setTimeout(function () {
+      WaitForTestEnd(
+        contentRootElement,
+        inPrintMode,
+        spellCheckedElements,
+        uri
+      );
+    }, 0);
+  } else {
+    if (doPrintMode(contentRootElement)) {
+      LogInfo("OnDocumentLoad setting up print mode");
+      setupPrintMode(contentRootElement);
+      inPrintMode = true;
+    }
+
+    // Since we can't use a bubbling-phase load listener from chrome,
+    // this is a capturing phase listener.  So do setTimeout twice, the
+    // first to get us after the onload has fired in the content, and
+    // the second to get us after any setTimeout(foo, 0) in the content.
+    gFailureReason =
+      "timed out waiting for test to complete (waiting for onload scripts to complete)";
+    LogInfo("OnDocumentLoad triggering AfterOnLoadScripts");
+    setTimeout(function () {
+      setTimeout(AfterOnLoadScripts, 0);
+    }, 0);
+  }
+}
+
+function CheckForProcessCrashExpectation(contentRootElement) {
+  if (
+    contentRootElement &&
+    contentRootElement.hasAttribute("class") &&
+    contentRootElement
+      .getAttribute("class")
+      .split(/\s+/)
+      .includes("reftest-expect-process-crash")
+  ) {
+    SendExpectProcessCrash();
+  }
+}
+
+async function RecordResult(forURL) {
+  if (forURL != gCurrentURL) {
+    LogInfo("RecordResult fired for previous document");
+    return;
+  }
+
+  if (gCurrentURLRecordResults > 0) {
+    LogInfo("RecordResult fired extra times");
     FinishTestItem();
-}
+    return;
+  }
+  gCurrentURLRecordResults++;
 
-function LoadFailed()
-{
-    if (gTimeoutHook) {
-        gTimeoutHook();
+  LogInfo("RecordResult fired");
+
+  var currentTestRunTime = Date.now() - gCurrentTestStartTime;
+
+  clearTimeout(gFailureTimeout);
+  gFailureReason = null;
+  gFailureTimeout = null;
+  gCurrentURL = null;
+  gCurrentURLTargetType = undefined;
+
+  if (gCurrentTestType == TYPE_PRINT) {
+    printToPdf();
+    return;
+  }
+  if (gCurrentTestType == TYPE_SCRIPT) {
+    var error = "";
+    var testwindow = content;
+
+    if (testwindow.wrappedJSObject) testwindow = testwindow.wrappedJSObject;
+
+    var testcases;
+    if (
+      !testwindow.getTestCases ||
+      typeof testwindow.getTestCases != "function"
+    ) {
+      // Force an unexpected failure to alert the test author to fix the test.
+      error = "test must provide a function getTestCases(). (SCRIPT)\n";
+    } else if (!(testcases = testwindow.getTestCases())) {
+      // Force an unexpected failure to alert the test author to fix the test.
+      error =
+        "test's getTestCases() must return an Array-like Object. (SCRIPT)\n";
+    } else if (testcases.length == 0) {
+      // This failure may be due to a JavaScript Engine bug causing
+      // early termination of the test. If we do not allow silent
+      // failure, the driver will report an error.
     }
-    gFailureTimeout = null;
-    SendFailedLoad(gFailureReason);
-}
 
-function FinishTestItem()
-{
-    gHaveCanvasSnapshot = false;
-}
-
-function DoAssertionCheck()
-{
-    gClearingForAssertionCheck = false;
-
-    var numAsserts = 0;
-    if (gDebug.isDebugBuild) {
-        var newAssertionCount = gDebug.assertionCount;
-        numAsserts = newAssertionCount - gAssertionCount;
-        gAssertionCount = newAssertionCount;
+    var results = [];
+    if (!error) {
+      // FIXME/bug 618176: temporary workaround
+      for (var i = 0; i < testcases.length; ++i) {
+        var test = testcases[i];
+        results.push({
+          passed: test.testPassed(),
+          description: test.testDescription(),
+        });
+      }
+      //results = testcases.map(function(test) {
+      //        return { passed: test.testPassed(),
+      //                 description: test.testDescription() };
     }
-    SendAssertionCount(numAsserts);
+
+    SendScriptResults(currentTestRunTime, error, results);
+    FinishTestItem();
+    return;
+  }
+
+  // Setup async scroll offsets now in case SynchronizeForSnapshot is not
+  // called (due to reftest-no-sync-layers being supplied, or in the single
+  // process case).
+  let changedAsyncScrollZoom = await setupAsyncScrollOffsets({
+    allowFailure: true,
+  });
+  if (setupAsyncZoom({ allowFailure: true })) {
+    changedAsyncScrollZoom = true;
+  }
+  if (changedAsyncScrollZoom && !gBrowserIsRemote) {
+    sendAsyncMessage("reftest:UpdateWholeCanvasForInvalidation");
+  }
+
+  SendTestDone(currentTestRunTime);
+  FinishTestItem();
 }
 
-function LoadURI(uri)
-{
-    let loadURIOptions = {
-      triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
-    };
-    webNavigation().loadURI(Services.io.newURI(uri), loadURIOptions);
+function LoadFailed() {
+  if (gTimeoutHook) {
+    gTimeoutHook();
+  }
+  gFailureTimeout = null;
+  SendFailedLoad(gFailureReason);
 }
 
-function LogError(str)
-{
-    if (gVerbose) {
-        sendSyncMessage("reftest:Log", { type: "error", msg: str });
-    } else {
-        sendAsyncMessage("reftest:Log", { type: "error", msg: str });
-    }
+function FinishTestItem() {
+  gHaveCanvasSnapshot = false;
 }
 
-function LogWarning(str)
-{
-    if (gVerbose) {
-        sendSyncMessage("reftest:Log", { type: "warning", msg: str });
-    } else {
-        sendAsyncMessage("reftest:Log", { type: "warning", msg: str });
-    }
+function DoAssertionCheck() {
+  gClearingForAssertionCheck = false;
+
+  var numAsserts = 0;
+  if (gDebug.isDebugBuild) {
+    var newAssertionCount = gDebug.assertionCount;
+    numAsserts = newAssertionCount - gAssertionCount;
+    gAssertionCount = newAssertionCount;
+  }
+  SendAssertionCount(numAsserts);
 }
 
-function LogInfo(str)
-{
-    if (gVerbose) {
-        sendSyncMessage("reftest:Log", { type: "info", msg: str });
-    } else {
-        sendAsyncMessage("reftest:Log", { type: "info", msg: str });
-    }
+function LoadURI(uri) {
+  let loadURIOptions = {
+    triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
+  };
+  webNavigation().loadURI(Services.io.newURI(uri), loadURIOptions);
 }
 
-function IsSnapshottableTestType()
-{
-    // Script, load-only, and PDF-print tests do not need any snapshotting.
-    return !(gCurrentTestType == TYPE_SCRIPT ||
-             gCurrentTestType == TYPE_LOAD ||
-             gCurrentTestType == TYPE_PRINT);
+function LogError(str) {
+  if (gVerbose) {
+    sendSyncMessage("reftest:Log", { type: "error", msg: str });
+  } else {
+    sendAsyncMessage("reftest:Log", { type: "error", msg: str });
+  }
+}
+
+function LogWarning(str) {
+  if (gVerbose) {
+    sendSyncMessage("reftest:Log", { type: "warning", msg: str });
+  } else {
+    sendAsyncMessage("reftest:Log", { type: "warning", msg: str });
+  }
+}
+
+function LogInfo(str) {
+  if (gVerbose) {
+    sendSyncMessage("reftest:Log", { type: "info", msg: str });
+  } else {
+    sendAsyncMessage("reftest:Log", { type: "info", msg: str });
+  }
+}
+
+function IsSnapshottableTestType() {
+  // Script, load-only, and PDF-print tests do not need any snapshotting.
+  return !(
+    gCurrentTestType == TYPE_SCRIPT ||
+    gCurrentTestType == TYPE_LOAD ||
+    gCurrentTestType == TYPE_PRINT
+  );
 }
 
 const SYNC_DEFAULT = 0x0;
 const SYNC_ALLOW_DISABLE = 0x1;
 // Returns a promise that resolve when the snapshot is done.
-function SynchronizeForSnapshot(flags)
-{
-    if (!IsSnapshottableTestType()) {
-        return Promise.resolve(undefined);
+function SynchronizeForSnapshot(flags) {
+  if (!IsSnapshottableTestType()) {
+    return Promise.resolve(undefined);
+  }
+
+  if (flags & SYNC_ALLOW_DISABLE) {
+    var docElt = content.document.documentElement;
+    if (
+      docElt &&
+      (docElt.hasAttribute("reftest-no-sync-layers") || shouldNotFlush(docElt))
+    ) {
+      LogInfo("Test file chose to skip SynchronizeForSnapshot");
+      return Promise.resolve(undefined);
     }
+  }
 
-    if (flags & SYNC_ALLOW_DISABLE) {
-        var docElt = content.document.documentElement;
-        if (docElt &&
-            (docElt.hasAttribute("reftest-no-sync-layers") ||
-             shouldNotFlush(docElt))) {
-            LogInfo("Test file chose to skip SynchronizeForSnapshot");
-            return Promise.resolve(undefined);
-        }
+  let browsingContext = content.docShell.browsingContext;
+  let promise = content.windowGlobalChild
+    .getActor("ReftestFission")
+    .sendQuery("UpdateLayerTree", { browsingContext });
+  return promise.then(
+    function (result) {
+      for (let errorString of result.errorStrings) {
+        LogError(errorString);
+      }
+      for (let infoString of result.infoStrings) {
+        LogInfo(infoString);
+      }
+
+      // Setup async scroll offsets now, because any scrollable layers should
+      // have had their AsyncPanZoomControllers created.
+      return setupAsyncScrollOffsets({ allowFailure: false }).then(function (
+        result
+      ) {
+        setupAsyncZoom({ allowFailure: false });
+      });
+    },
+    function (reason) {
+      // We expect actors to go away causing sendQuery's to fail, so
+      // just note it.
+      LogInfo("UpdateLayerTree sendQuery to parent rejected: " + reason);
+
+      // Setup async scroll offsets now, because any scrollable layers should
+      // have had their AsyncPanZoomControllers created.
+      return setupAsyncScrollOffsets({ allowFailure: false }).then(function (
+        result
+      ) {
+        setupAsyncZoom({ allowFailure: false });
+      });
     }
-
-    let browsingContext = content.docShell.browsingContext;
-    let promise = content.windowGlobalChild.getActor("ReftestFission").sendQuery("UpdateLayerTree", {browsingContext});
-    return promise.then(function (result) {
-        for (let errorString of result.errorStrings) {
-            LogError(errorString);
-        }
-        for (let infoString of result.infoStrings) {
-            LogInfo(infoString);
-        }
-
-        // Setup async scroll offsets now, because any scrollable layers should
-        // have had their AsyncPanZoomControllers created.
-        return setupAsyncScrollOffsets({allowFailure:false}).then(function(result) {
-            setupAsyncZoom({allowFailure:false});
-        });
-    }, function(reason) {
-        // We expect actors to go away causing sendQuery's to fail, so
-        // just note it.
-        LogInfo("UpdateLayerTree sendQuery to parent rejected: " + reason);
-
-        // Setup async scroll offsets now, because any scrollable layers should
-        // have had their AsyncPanZoomControllers created.
-        return setupAsyncScrollOffsets({allowFailure:false}).then(function(result) {
-            setupAsyncZoom({allowFailure:false});
-        });
-    });
+  );
 }
 
-function RegisterMessageListeners()
-{
-    addMessageListener(
-        "reftest:Clear",
-        function (m) { RecvClear() }
-    );
-    addMessageListener(
-        "reftest:LoadScriptTest",
-        function (m) { RecvLoadScriptTest(m.json.uri, m.json.timeout); }
-    );
-    addMessageListener(
-        "reftest:LoadPrintTest",
-        function (m) { RecvLoadPrintTest(m.json.uri, m.json.timeout); }
-    );
-    addMessageListener(
-        "reftest:LoadTest",
-        function (m) { RecvLoadTest(m.json.type, m.json.uri,
-                                    m.json.uriTargetType,
-                                    m.json.timeout); }
-    );
-    addMessageListener(
-        "reftest:ResetRenderingState",
-        function (m) { RecvResetRenderingState(); }
-    );
-    addMessageListener(
-        "reftest:PrintDone",
-        function (m) { RecvPrintDone(m.json.status, m.json.fileName); }
-    );
-    addMessageListener(
-        "reftest:UpdateCanvasWithSnapshotDone",
-        function (m) { RecvUpdateCanvasWithSnapshotDone(m.json.painted); }
-    );
+function RegisterMessageListeners() {
+  addMessageListener("reftest:Clear", function (m) {
+    RecvClear();
+  });
+  addMessageListener("reftest:LoadScriptTest", function (m) {
+    RecvLoadScriptTest(m.json.uri, m.json.timeout);
+  });
+  addMessageListener("reftest:LoadPrintTest", function (m) {
+    RecvLoadPrintTest(m.json.uri, m.json.timeout);
+  });
+  addMessageListener("reftest:LoadTest", function (m) {
+    RecvLoadTest(m.json.type, m.json.uri, m.json.uriTargetType, m.json.timeout);
+  });
+  addMessageListener("reftest:ResetRenderingState", function (m) {
+    RecvResetRenderingState();
+  });
+  addMessageListener("reftest:PrintDone", function (m) {
+    RecvPrintDone(m.json.status, m.json.fileName);
+  });
+  addMessageListener("reftest:UpdateCanvasWithSnapshotDone", function (m) {
+    RecvUpdateCanvasWithSnapshotDone(m.json.painted);
+  });
 }
 
-function RecvClear()
-{
-    gClearingForAssertionCheck = true;
-    LoadURI(BLANK_URL_FOR_CLEARING);
+function RecvClear() {
+  gClearingForAssertionCheck = true;
+  LoadURI(BLANK_URL_FOR_CLEARING);
 }
 
-function RecvLoadTest(type, uri, uriTargetType, timeout)
-{
-    StartTestURI(type, uri, uriTargetType, timeout);
+function RecvLoadTest(type, uri, uriTargetType, timeout) {
+  StartTestURI(type, uri, uriTargetType, timeout);
 }
 
-function RecvLoadScriptTest(uri, timeout)
-{
-    StartTestURI(TYPE_SCRIPT, uri, URL_TARGET_TYPE_TEST, timeout);
+function RecvLoadScriptTest(uri, timeout) {
+  StartTestURI(TYPE_SCRIPT, uri, URL_TARGET_TYPE_TEST, timeout);
 }
 
-function RecvLoadPrintTest(uri, timeout)
-{
-    StartTestURI(TYPE_PRINT, uri, URL_TARGET_TYPE_TEST, timeout);
+function RecvLoadPrintTest(uri, timeout) {
+  StartTestURI(TYPE_PRINT, uri, URL_TARGET_TYPE_TEST, timeout);
 }
 
-function RecvResetRenderingState()
-{
-    resetZoomAndTextZoom();
-    resetDisplayportAndViewport();
+function RecvResetRenderingState() {
+  resetZoomAndTextZoom();
+  resetDisplayportAndViewport();
 }
 
-function RecvPrintDone(status, fileName)
-{
-    const currentTestRunTime = Date.now() - gCurrentTestStartTime;
-    SendPrintResult(currentTestRunTime, status, fileName);
-    FinishTestItem();
+function RecvPrintDone(status, fileName) {
+  const currentTestRunTime = Date.now() - gCurrentTestStartTime;
+  SendPrintResult(currentTestRunTime, status, fileName);
+  FinishTestItem();
 }
 
-function RecvUpdateCanvasWithSnapshotDone(painted)
-{
-    gUpdateCanvasPromiseResolver(painted);
+function RecvUpdateCanvasWithSnapshotDone(painted) {
+  gUpdateCanvasPromiseResolver(painted);
 }
 
-function SendAssertionCount(numAssertions)
-{
-    sendAsyncMessage("reftest:AssertionCount", { count: numAssertions });
+function SendAssertionCount(numAssertions) {
+  sendAsyncMessage("reftest:AssertionCount", { count: numAssertions });
 }
 
-function SendContentReady()
-{
-    let gfxInfo = (NS_GFXINFO_CONTRACTID in Cc) && Cc[NS_GFXINFO_CONTRACTID].getService(Ci.nsIGfxInfo);
+function SendContentReady() {
+  let gfxInfo =
+    NS_GFXINFO_CONTRACTID in Cc &&
+    Cc[NS_GFXINFO_CONTRACTID].getService(Ci.nsIGfxInfo);
 
-    let info = {};
+  let info = {};
 
-    try {
-        info.D2DEnabled = gfxInfo.D2DEnabled;
-        info.DWriteEnabled = gfxInfo.DWriteEnabled;
-        info.EmbeddedInFirefoxReality = gfxInfo.EmbeddedInFirefoxReality;
-    } catch (e) {
-        info.D2DEnabled = false;
-        info.DWriteEnabled = false;
-        info.EmbeddedInFirefoxReality = false;
-    }
+  try {
+    info.D2DEnabled = gfxInfo.D2DEnabled;
+    info.DWriteEnabled = gfxInfo.DWriteEnabled;
+    info.EmbeddedInFirefoxReality = gfxInfo.EmbeddedInFirefoxReality;
+  } catch (e) {
+    info.D2DEnabled = false;
+    info.DWriteEnabled = false;
+    info.EmbeddedInFirefoxReality = false;
+  }
 
-    info.AzureCanvasBackend = gfxInfo.AzureCanvasBackend;
-    info.AzureContentBackend = gfxInfo.AzureContentBackend;
+  info.AzureCanvasBackend = gfxInfo.AzureCanvasBackend;
+  info.AzureContentBackend = gfxInfo.AzureContentBackend;
 
-    return sendSyncMessage("reftest:ContentReady", { 'gfx': info })[0];
+  return sendSyncMessage("reftest:ContentReady", { gfx: info })[0];
 }
 
-function SendException(what)
-{
-    sendAsyncMessage("reftest:Exception", { what: what });
+function SendException(what) {
+  sendAsyncMessage("reftest:Exception", { what: what });
 }
 
-function SendFailedLoad(why)
-{
-    sendAsyncMessage("reftest:FailedLoad", { why: why });
+function SendFailedLoad(why) {
+  sendAsyncMessage("reftest:FailedLoad", { why: why });
 }
 
-function SendFailedNoPaint()
-{
-    sendAsyncMessage("reftest:FailedNoPaint");
+function SendFailedNoPaint() {
+  sendAsyncMessage("reftest:FailedNoPaint");
 }
 
-function SendFailedNoDisplayList()
-{
-    sendAsyncMessage("reftest:FailedNoDisplayList");
+function SendFailedNoDisplayList() {
+  sendAsyncMessage("reftest:FailedNoDisplayList");
 }
 
-function SendFailedDisplayList()
-{
-    sendAsyncMessage("reftest:FailedDisplayList");
+function SendFailedDisplayList() {
+  sendAsyncMessage("reftest:FailedDisplayList");
 }
 
-function SendFailedOpaqueLayer(why)
-{
-    sendAsyncMessage("reftest:FailedOpaqueLayer", { why: why });
+function SendFailedOpaqueLayer(why) {
+  sendAsyncMessage("reftest:FailedOpaqueLayer", { why: why });
 }
 
-function SendFailedAssignedLayer(why)
-{
-    sendAsyncMessage("reftest:FailedAssignedLayer", { why: why });
+function SendFailedAssignedLayer(why) {
+  sendAsyncMessage("reftest:FailedAssignedLayer", { why: why });
 }
 
 // Returns a promise that resolves to a bool that indicates if a snapshot was taken.
-async function SendInitCanvasWithSnapshot(forURL)
-{
-    if (forURL != gCurrentURL) {
-        LogInfo("SendInitCanvasWithSnapshot called for previous document");
-        // Lie and say we painted because it doesn't matter, this is a test we
-        // are already done with that is clearing out. Then AfterOnLoadScripts
-        // should finish quicker if that is who is calling us.
-        return Promise.resolve(true);
-    }
+async function SendInitCanvasWithSnapshot(forURL) {
+  if (forURL != gCurrentURL) {
+    LogInfo("SendInitCanvasWithSnapshot called for previous document");
+    // Lie and say we painted because it doesn't matter, this is a test we
+    // are already done with that is clearing out. Then AfterOnLoadScripts
+    // should finish quicker if that is who is calling us.
+    return Promise.resolve(true);
+  }
 
-    // If we're in the same process as the top-level XUL window, then
-    // drawing that window will also update our layers, so no
-    // synchronization is needed.
-    //
-    // NB: this is a test-harness optimization only, it must not
-    // affect the validity of the tests.
-    if (gBrowserIsRemote) {
-        await SynchronizeForSnapshot(SYNC_DEFAULT);
-        let promise = new Promise(resolve => { gUpdateCanvasPromiseResolver = resolve; });
-        sendAsyncMessage("reftest:InitCanvasWithSnapshot");
-
-        gHaveCanvasSnapshot = await promise;
-        return gHaveCanvasSnapshot;
-    }
-
-    // For in-process browser, we have to make a synchronous request
-    // here to make the above optimization valid, so that MozWaitPaint
-    // events dispatched (synchronously) during painting are received
-    // before we check the paint-wait counter.  For out-of-process
-    // browser though, it doesn't wrt correctness whether this request
-    // is sync or async.
-    let promise = new Promise(resolve => { gUpdateCanvasPromiseResolver = resolve; });
+  // If we're in the same process as the top-level XUL window, then
+  // drawing that window will also update our layers, so no
+  // synchronization is needed.
+  //
+  // NB: this is a test-harness optimization only, it must not
+  // affect the validity of the tests.
+  if (gBrowserIsRemote) {
+    await SynchronizeForSnapshot(SYNC_DEFAULT);
+    let promise = new Promise(resolve => {
+      gUpdateCanvasPromiseResolver = resolve;
+    });
     sendAsyncMessage("reftest:InitCanvasWithSnapshot");
 
     gHaveCanvasSnapshot = await promise;
-    return Promise.resolve(gHaveCanvasSnapshot);
+    return gHaveCanvasSnapshot;
+  }
+
+  // For in-process browser, we have to make a synchronous request
+  // here to make the above optimization valid, so that MozWaitPaint
+  // events dispatched (synchronously) during painting are received
+  // before we check the paint-wait counter.  For out-of-process
+  // browser though, it doesn't wrt correctness whether this request
+  // is sync or async.
+  let promise = new Promise(resolve => {
+    gUpdateCanvasPromiseResolver = resolve;
+  });
+  sendAsyncMessage("reftest:InitCanvasWithSnapshot");
+
+  gHaveCanvasSnapshot = await promise;
+  return Promise.resolve(gHaveCanvasSnapshot);
 }
 
-function SendScriptResults(runtimeMs, error, results)
-{
-    sendAsyncMessage("reftest:ScriptResults",
-                     { runtimeMs: runtimeMs, error: error, results: results });
+function SendScriptResults(runtimeMs, error, results) {
+  sendAsyncMessage("reftest:ScriptResults", {
+    runtimeMs: runtimeMs,
+    error: error,
+    results: results,
+  });
 }
 
-function SendStartPrint(isPrintSelection, printRange)
-{
-    sendAsyncMessage("reftest:StartPrint", { isPrintSelection, printRange });
+function SendStartPrint(isPrintSelection, printRange) {
+  sendAsyncMessage("reftest:StartPrint", { isPrintSelection, printRange });
 }
 
-function SendPrintResult(runtimeMs, status, fileName)
-{
-    sendAsyncMessage("reftest:PrintResult",
-                     { runtimeMs: runtimeMs, status: status, fileName: fileName });
+function SendPrintResult(runtimeMs, status, fileName) {
+  sendAsyncMessage("reftest:PrintResult", {
+    runtimeMs: runtimeMs,
+    status: status,
+    fileName: fileName,
+  });
 }
 
-function SendExpectProcessCrash(runtimeMs)
-{
-    sendAsyncMessage("reftest:ExpectProcessCrash");
+function SendExpectProcessCrash(runtimeMs) {
+  sendAsyncMessage("reftest:ExpectProcessCrash");
 }
 
-function SendTestDone(runtimeMs)
-{
-    sendAsyncMessage("reftest:TestDone", { runtimeMs: runtimeMs });
+function SendTestDone(runtimeMs) {
+  sendAsyncMessage("reftest:TestDone", { runtimeMs: runtimeMs });
 }
 
-function roundTo(x, fraction)
-{
-    return Math.round(x/fraction)*fraction;
+function roundTo(x, fraction) {
+  return Math.round(x / fraction) * fraction;
 }
 
-function elementDescription(element)
-{
-    return '<' + element.localName +
-        [].slice.call(element.attributes).map((attr) =>
-            ` ${attr.nodeName}="${attr.value}"`).join('') +
-        '>';
+function elementDescription(element) {
+  return (
+    "<" +
+    element.localName +
+    [].slice
+      .call(element.attributes)
+      .map(attr => ` ${attr.nodeName}="${attr.value}"`)
+      .join("") +
+    ">"
+  );
 }
 
-async function SendUpdateCanvasForEvent(forURL, rectList, contentRootElement)
-{
-    if (forURL != gCurrentURL) {
-        LogInfo("SendUpdateCanvasForEvent called for previous document");
-        // This is a test we are already done with that is clearing out.
-        // Don't do anything.
-        return;
-    }
+async function SendUpdateCanvasForEvent(forURL, rectList, contentRootElement) {
+  if (forURL != gCurrentURL) {
+    LogInfo("SendUpdateCanvasForEvent called for previous document");
+    // This is a test we are already done with that is clearing out.
+    // Don't do anything.
+    return;
+  }
 
-    var win = content;
-    var scale = docShell.browsingContext.fullZoom;
-
-    var rects = [ ];
-    if (shouldSnapshotWholePage(contentRootElement)) {
-      // See comments in SendInitCanvasWithSnapshot() re: the split
-      // logic here.
-      if (!gBrowserIsRemote) {
-          sendSyncMessage("reftest:UpdateWholeCanvasForInvalidation");
-      } else {
-          await SynchronizeForSnapshot(SYNC_ALLOW_DISABLE);
-          let promise = new Promise(resolve => { gUpdateCanvasPromiseResolver = resolve; });
-          sendAsyncMessage("reftest:UpdateWholeCanvasForInvalidation");
-          await promise;
-      }
-      return;
-    }
-
-    var message;
-
-    if (!windowUtils().isMozAfterPaintPending) {
-        // Webrender doesn't have invalidation, and animations on the compositor
-        // don't invoke any MozAfterEvent which means we have no invalidated
-        // rect so we just invalidate the whole screen once we don't have
-        // anymore paints pending. This will force the snapshot.
-
-        LogInfo("Sending update whole canvas for invalidation");
-        message = "reftest:UpdateWholeCanvasForInvalidation";
-    } else {
-        LogInfo("SendUpdateCanvasForEvent with " + rectList.length + " rects");
-        for (var i = 0; i < rectList.length; ++i) {
-            var r = rectList[i];
-            // Set left/top/right/bottom to "device pixel" boundaries
-            var left = Math.floor(roundTo(r.left * scale, 0.001));
-            var top = Math.floor(roundTo(r.top * scale, 0.001));
-            var right = Math.ceil(roundTo(r.right * scale, 0.001));
-            var bottom = Math.ceil(roundTo(r.bottom * scale, 0.001));
-            LogInfo("Rect: " + left + " " + top + " " + right + " " + bottom);
-
-            rects.push({ left: left, top: top, right: right, bottom: bottom });
-        }
-
-        message = "reftest:UpdateCanvasForInvalidation";
-    }
+  var win = content;
+  var scale = docShell.browsingContext.fullZoom;
 
+  var rects = [];
+  if (shouldSnapshotWholePage(contentRootElement)) {
     // See comments in SendInitCanvasWithSnapshot() re: the split
     // logic here.
     if (!gBrowserIsRemote) {
-        sendSyncMessage(message, { rects: rects });
+      sendSyncMessage("reftest:UpdateWholeCanvasForInvalidation");
     } else {
-        await SynchronizeForSnapshot(SYNC_ALLOW_DISABLE);
-        let promise = new Promise(resolve => { gUpdateCanvasPromiseResolver = resolve; });
-        sendAsyncMessage(message, { rects: rects });
-        await promise;
+      await SynchronizeForSnapshot(SYNC_ALLOW_DISABLE);
+      let promise = new Promise(resolve => {
+        gUpdateCanvasPromiseResolver = resolve;
+      });
+      sendAsyncMessage("reftest:UpdateWholeCanvasForInvalidation");
+      await promise;
     }
+    return;
+  }
+
+  var message;
+
+  if (!windowUtils().isMozAfterPaintPending) {
+    // Webrender doesn't have invalidation, and animations on the compositor
+    // don't invoke any MozAfterEvent which means we have no invalidated
+    // rect so we just invalidate the whole screen once we don't have
+    // anymore paints pending. This will force the snapshot.
+
+    LogInfo("Sending update whole canvas for invalidation");
+    message = "reftest:UpdateWholeCanvasForInvalidation";
+  } else {
+    LogInfo("SendUpdateCanvasForEvent with " + rectList.length + " rects");
+    for (var i = 0; i < rectList.length; ++i) {
+      var r = rectList[i];
+      // Set left/top/right/bottom to "device pixel" boundaries
+      var left = Math.floor(roundTo(r.left * scale, 0.001));
+      var top = Math.floor(roundTo(r.top * scale, 0.001));
+      var right = Math.ceil(roundTo(r.right * scale, 0.001));
+      var bottom = Math.ceil(roundTo(r.bottom * scale, 0.001));
+      LogInfo("Rect: " + left + " " + top + " " + right + " " + bottom);
+
+      rects.push({ left: left, top: top, right: right, bottom: bottom });
+    }
+
+    message = "reftest:UpdateCanvasForInvalidation";
+  }
+
+  // See comments in SendInitCanvasWithSnapshot() re: the split
+  // logic here.
+  if (!gBrowserIsRemote) {
+    sendSyncMessage(message, { rects: rects });
+  } else {
+    await SynchronizeForSnapshot(SYNC_ALLOW_DISABLE);
+    let promise = new Promise(resolve => {
+      gUpdateCanvasPromiseResolver = resolve;
+    });
+    sendAsyncMessage(message, { rects: rects });
+    await promise;
+  }
 }
 
 if (content.document.readyState == "complete") {
diff --git a/layout/tools/reftest/reftest.jsm b/layout/tools/reftest/reftest.jsm
index c2d22eb4f04b..b09722441f4a 100644
--- a/layout/tools/reftest/reftest.jsm
+++ b/layout/tools/reftest/reftest.jsm
@@ -3,59 +3,56 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 "use strict";
 
-var EXPORTED_SYMBOLS = [
-    "OnRefTestLoad",
-    "OnRefTestUnload",
-];
+var EXPORTED_SYMBOLS = ["OnRefTestLoad", "OnRefTestUnload"];
 
 const { FileUtils } = ChromeUtils.importESModule(
-    "resource://gre/modules/FileUtils.sys.mjs"
+  "resource://gre/modules/FileUtils.sys.mjs"
 );
 const {
-    XHTML_NS,
-    XUL_NS,
+  XHTML_NS,
+  XUL_NS,
 
-    IO_SERVICE_CONTRACTID,
-    DEBUG_CONTRACTID,
-    NS_DIRECTORY_SERVICE_CONTRACTID,
-    NS_OBSERVER_SERVICE_CONTRACTID,
+  IO_SERVICE_CONTRACTID,
+  DEBUG_CONTRACTID,
+  NS_DIRECTORY_SERVICE_CONTRACTID,
+  NS_OBSERVER_SERVICE_CONTRACTID,
 
-    TYPE_REFTEST_EQUAL,
-    TYPE_REFTEST_NOTEQUAL,
-    TYPE_LOAD,
-    TYPE_SCRIPT,
-    TYPE_PRINT,
+  TYPE_REFTEST_EQUAL,
+  TYPE_REFTEST_NOTEQUAL,
+  TYPE_LOAD,
+  TYPE_SCRIPT,
+  TYPE_PRINT,
 
-    URL_TARGET_TYPE_TEST,
-    URL_TARGET_TYPE_REFERENCE,
+  URL_TARGET_TYPE_TEST,
+  URL_TARGET_TYPE_REFERENCE,
 
-    EXPECTED_PASS,
-    EXPECTED_FAIL,
-    EXPECTED_RANDOM,
-    EXPECTED_FUZZY,
+  EXPECTED_PASS,
+  EXPECTED_FAIL,
+  EXPECTED_RANDOM,
+  EXPECTED_FUZZY,
 
-    PREF_BOOLEAN,
-    PREF_STRING,
-    PREF_INTEGER,
+  PREF_BOOLEAN,
+  PREF_STRING,
+  PREF_INTEGER,
 
-    FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS,
+  FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS,
 
-    g,
+  g,
 } = ChromeUtils.import("resource://reftest/globals.jsm");
 const { HttpServer } = ChromeUtils.importESModule(
-    "resource://reftest/httpd.sys.mjs"
+  "resource://reftest/httpd.sys.mjs"
 );
 const { ReadTopManifest, CreateUrls } = ChromeUtils.import(
-    "resource://reftest/manifest.jsm"
+  "resource://reftest/manifest.jsm"
 );
 const { StructuredLogger } = ChromeUtils.importESModule(
-    "resource://reftest/StructuredLog.sys.mjs"
+  "resource://reftest/StructuredLog.sys.mjs"
 );
 const { PerTestCoverageUtils } = ChromeUtils.importESModule(
-    "resource://reftest/PerTestCoverageUtils.sys.mjs"
+  "resource://reftest/PerTestCoverageUtils.sys.mjs"
 );
 const { XPCOMUtils } = ChromeUtils.importESModule(
-    "resource://gre/modules/XPCOMUtils.sys.mjs"
+  "resource://gre/modules/XPCOMUtils.sys.mjs"
 );
 
 const { E10SUtils } = ChromeUtils.importESModule(
@@ -71,24 +68,25 @@ XPCOMUtils.defineLazyServiceGetters(lazy, {
   ],
 });
 
-function HasUnexpectedResult()
-{
-    return g.testResults.Exception > 0 ||
-           g.testResults.FailedLoad > 0 ||
-           g.testResults.UnexpectedFail > 0 ||
-           g.testResults.UnexpectedPass > 0 ||
-           g.testResults.AssertionUnexpected > 0 ||
-           g.testResults.AssertionUnexpectedFixed > 0;
+function HasUnexpectedResult() {
+  return (
+    g.testResults.Exception > 0 ||
+    g.testResults.FailedLoad > 0 ||
+    g.testResults.UnexpectedFail > 0 ||
+    g.testResults.UnexpectedPass > 0 ||
+    g.testResults.AssertionUnexpected > 0 ||
+    g.testResults.AssertionUnexpectedFixed > 0
+  );
 }
 
 // By default we just log to stdout
-var gDumpFn = function(line) {
+var gDumpFn = function (line) {
   dump(line);
   if (g.logFile) {
     g.logFile.writeString(line);
   }
-}
-var gDumpRawLog = function(record) {
+};
+var gDumpRawLog = function (record) {
   // Dump JSON representation of data on a single line
   var line = "\n" + JSON.stringify(record) + "\n";
   dump(line);
@@ -96,12 +94,11 @@ var gDumpRawLog = function(record) {
   if (g.logFile) {
     g.logFile.writeString(line);
   }
-}
-g.logger = new StructuredLogger('reftest', gDumpRawLog);
+};
+g.logger = new StructuredLogger("reftest", gDumpRawLog);
 var logger = g.logger;
 
-function TestBuffer(str)
-{
+function TestBuffer(str) {
   logger.debug(str);
   g.testLog.push(str);
 }
@@ -110,14 +107,12 @@ function isAndroidDevice() {
   var xr = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULRuntime);
   // This is the best we can do for now; maybe in the future we'll have
   // more correct detection of this case.
-  return xr.OS == "Android" &&
-      g.browserIsRemote;
+  return xr.OS == "Android" && g.browserIsRemote;
 }
 
-function FlushTestBuffer()
-{
+function FlushTestBuffer() {
   // In debug mode, we've dumped all these messages already.
-  if (g.logLevel !== 'debug') {
+  if (g.logLevel !== "debug") {
     for (var i = 0; i < g.testLog.length; ++i) {
       logger.info("Saved log: " + g.testLog[i]);
     }
@@ -125,605 +120,640 @@ function FlushTestBuffer()
   g.testLog = [];
 }
 
-function LogWidgetLayersFailure()
-{
+function LogWidgetLayersFailure() {
   logger.error(
     "Screen resolution is too low - USE_WIDGET_LAYERS was disabled. " +
-    (g.browserIsRemote ?
-      "Since E10s is enabled, there is no fallback rendering path!" :
-      "The fallback rendering path is not reliably consistent with on-screen rendering."));
+      (g.browserIsRemote
+        ? "Since E10s is enabled, there is no fallback rendering path!"
+        : "The fallback rendering path is not reliably consistent with on-screen rendering.")
+  );
 
   logger.error(
     "If you cannot increase your screen resolution you can try reducing " +
-    "gecko's pixel scaling by adding something like '--setpref " +
-    "layout.css.devPixelsPerPx=1.0' to your './mach reftest' command " +
-    "(possibly as an alias in ~/.mozbuild/machrc). Note that this is " +
-    "inconsistent with CI testing, and may interfere with HighDPI/" +
-    "reftest-zoom tests.");
+      "gecko's pixel scaling by adding something like '--setpref " +
+      "layout.css.devPixelsPerPx=1.0' to your './mach reftest' command " +
+      "(possibly as an alias in ~/.mozbuild/machrc). Note that this is " +
+      "inconsistent with CI testing, and may interfere with HighDPI/" +
+      "reftest-zoom tests."
+  );
 }
 
-function AllocateCanvas()
-{
-    if (g.recycledCanvases.length > 0) {
-        return g.recycledCanvases.shift();
-    }
+function AllocateCanvas() {
+  if (g.recycledCanvases.length > 0) {
+    return g.recycledCanvases.shift();
+  }
 
-    var canvas = g.containingWindow.document.createElementNS(XHTML_NS, "canvas");
-    var r = g.browser.getBoundingClientRect();
-    canvas.setAttribute("width", Math.ceil(r.width));
-    canvas.setAttribute("height", Math.ceil(r.height));
+  var canvas = g.containingWindow.document.createElementNS(XHTML_NS, "canvas");
+  var r = g.browser.getBoundingClientRect();
+  canvas.setAttribute("width", Math.ceil(r.width));
+  canvas.setAttribute("height", Math.ceil(r.height));
 
-    return canvas;
+  return canvas;
 }
 
-function ReleaseCanvas(canvas)
-{
-    // store a maximum of 2 canvases, if we're not caching
-    if (!g.noCanvasCache || g.recycledCanvases.length < 2) {
-        g.recycledCanvases.push(canvas);
-    }
+function ReleaseCanvas(canvas) {
+  // store a maximum of 2 canvases, if we're not caching
+  if (!g.noCanvasCache || g.recycledCanvases.length < 2) {
+    g.recycledCanvases.push(canvas);
+  }
 }
 
-function IDForEventTarget(event)
-{
-    try {
-        return "'" + event.target.getAttribute('id') + "'";
-    } catch (ex) {
-        return "<unknown>";
-    }
+function IDForEventTarget(event) {
+  try {
+    return "'" + event.target.getAttribute("id") + "'";
+  } catch (ex) {
+    return "<unknown>";
+  }
 }
 
-function OnRefTestLoad(win)
-{
-    g.crashDumpDir = Cc[NS_DIRECTORY_SERVICE_CONTRACTID]
-                    .getService(Ci.nsIProperties)
-                    .get("ProfD", Ci.nsIFile);
-    g.crashDumpDir.append("minidumps");
+function OnRefTestLoad(win) {
+  g.crashDumpDir = Cc[NS_DIRECTORY_SERVICE_CONTRACTID].getService(
+    Ci.nsIProperties
+  ).get("ProfD", Ci.nsIFile);
+  g.crashDumpDir.append("minidumps");
 
-    g.pendingCrashDumpDir = Cc[NS_DIRECTORY_SERVICE_CONTRACTID]
-                    .getService(Ci.nsIProperties)
-                    .get("UAppData", Ci.nsIFile);
-    g.pendingCrashDumpDir.append("Crash Reports");
-    g.pendingCrashDumpDir.append("pending");
+  g.pendingCrashDumpDir = Cc[NS_DIRECTORY_SERVICE_CONTRACTID].getService(
+    Ci.nsIProperties
+  ).get("UAppData", Ci.nsIFile);
+  g.pendingCrashDumpDir.append("Crash Reports");
+  g.pendingCrashDumpDir.append("pending");
 
-    g.browserIsRemote = Services.appinfo.browserTabsRemoteAutostart;
-    g.browserIsFission = Services.appinfo.fissionAutostart;
+  g.browserIsRemote = Services.appinfo.browserTabsRemoteAutostart;
+  g.browserIsFission = Services.appinfo.fissionAutostart;
 
-    var prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefBranch);
-    g.browserIsIframe = prefs.getBoolPref("reftest.browser.iframe.enabled", false);
-    g.useDrawSnapshot = prefs.getBoolPref("reftest.use-draw-snapshot", false);
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+    Ci.nsIPrefBranch
+  );
+  g.browserIsIframe = prefs.getBoolPref(
+    "reftest.browser.iframe.enabled",
+    false
+  );
+  g.useDrawSnapshot = prefs.getBoolPref("reftest.use-draw-snapshot", false);
 
-    g.logLevel = prefs.getStringPref("reftest.logLevel", "info");
+  g.logLevel = prefs.getStringPref("reftest.logLevel", "info");
 
-    if (win === undefined || win == null) {
-      win = window;
-    }
-    if (g.containingWindow == null && win != null) {
-      g.containingWindow = win;
+  if (win === undefined || win == null) {
+    win = window;
+  }
+  if (g.containingWindow == null && win != null) {
+    g.containingWindow = win;
+  }
+
+  if (g.browserIsIframe) {
+    g.browser = g.containingWindow.document.createElementNS(XHTML_NS, "iframe");
+    g.browser.setAttribute("mozbrowser", "");
+  } else {
+    g.browser = g.containingWindow.document.createElementNS(
+      XUL_NS,
+      "xul:browser"
+    );
+  }
+  g.browser.setAttribute("id", "browser");
+  g.browser.setAttribute("type", "content");
+  g.browser.setAttribute("primary", "true");
+  g.browser.setAttribute("remote", g.browserIsRemote ? "true" : "false");
+  // Make sure the browser element is exactly 800x1000, no matter
+  // what size our window is
+  g.browser.setAttribute(
+    "style",
+    "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px; color-scheme: env(-moz-content-preferred-color-scheme)"
+  );
+
+  if (Services.appinfo.OS == "Android") {
+    let doc = g.containingWindow.document.getElementById("main-window");
+    while (doc.hasChildNodes()) {
+      doc.firstChild.remove();
     }
+    doc.appendChild(g.browser);
+    // TODO Bug 1156817: reftests don't have most of GeckoView infra so we
+    // can't register this actor
+    ChromeUtils.unregisterWindowActor("LoadURIDelegate");
+  } else {
+    document.getElementById("reftest-window").appendChild(g.browser);
+  }
 
-    if (g.browserIsIframe) {
-      g.browser = g.containingWindow.document.createElementNS(XHTML_NS, "iframe");
-      g.browser.setAttribute("mozbrowser", "");
-    } else {
-      g.browser = g.containingWindow.document.createElementNS(XUL_NS, "xul:browser");
-    }
-    g.browser.setAttribute("id", "browser");
-    g.browser.setAttribute("type", "content");
-    g.browser.setAttribute("primary", "true");
-    g.browser.setAttribute("remote", g.browserIsRemote ? "true" : "false");
-    // Make sure the browser element is exactly 800x1000, no matter
-    // what size our window is
-    g.browser.setAttribute("style", "padding: 0px; margin: 0px; border:none; min-width: 800px; min-height: 1000px; max-width: 800px; max-height: 1000px; color-scheme: env(-moz-content-preferred-color-scheme)");
+  g.browserMessageManager = g.browser.frameLoader.messageManager;
+  // The content script waits for the initial onload, then notifies
+  // us.
+  RegisterMessageListenersAndLoadContentScript(false);
+}
 
-    if (Services.appinfo.OS == "Android") {
-      let doc = g.containingWindow.document.getElementById('main-window');
-      while (doc.hasChildNodes()) {
-        doc.firstChild.remove();
+function InitAndStartRefTests() {
+  /* These prefs are optional, so we don't need to spit an error to the log */
+  try {
+    var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+      Ci.nsIPrefBranch
+    );
+  } catch (e) {
+    logger.error("EXCEPTION: " + e);
+  }
+
+  try {
+    prefs.setBoolPref("android.widget_paints_background", false);
+  } catch (e) {}
+
+  // If fission is enabled, then also put data: URIs in the default web process,
+  // since most reftests run in the file process, and this will make data:
+  // <iframe>s OOP.
+  if (g.browserIsFission) {
+    prefs.setBoolPref("browser.tabs.remote.dataUriInDefaultWebProcess", true);
+  }
+
+  /* set the g.loadTimeout */
+  try {
+    g.loadTimeout = prefs.getIntPref("reftest.timeout");
+  } catch (e) {
+    g.loadTimeout = 5 * 60 * 1000; //5 minutes as per bug 479518
+  }
+
+  /* Get the logfile for android tests */
+  try {
+    var logFile = prefs.getStringPref("reftest.logFile");
+    if (logFile) {
+      var f = FileUtils.File(logFile);
+      var out = FileUtils.openFileOutputStream(
+        f,
+        FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE
+      );
+      g.logFile = Cc[
+        "@mozilla.org/intl/converter-output-stream;1"
+      ].createInstance(Ci.nsIConverterOutputStream);
+      g.logFile.init(out, null);
+    }
+  } catch (e) {}
+
+  g.remote = prefs.getBoolPref("reftest.remote", false);
+
+  g.ignoreWindowSize = prefs.getBoolPref("reftest.ignoreWindowSize", false);
+
+  /* Support for running a chunk (subset) of tests.  In separate try as this is optional */
+  try {
+    g.totalChunks = prefs.getIntPref("reftest.totalChunks");
+    g.thisChunk = prefs.getIntPref("reftest.thisChunk");
+  } catch (e) {
+    g.totalChunks = 0;
+    g.thisChunk = 0;
+  }
+
+  try {
+    g.focusFilterMode = prefs.getStringPref("reftest.focusFilterMode");
+  } catch (e) {}
+
+  try {
+    g.isCoverageBuild = prefs.getBoolPref("reftest.isCoverageBuild");
+  } catch (e) {}
+
+  try {
+    g.compareRetainedDisplayLists = prefs.getBoolPref(
+      "reftest.compareRetainedDisplayLists"
+    );
+  } catch (e) {}
+
+  try {
+    // We have to set print.always_print_silent or a print dialog would
+    // appear for each print operation, which would interrupt the test run.
+    prefs.setBoolPref("print.always_print_silent", true);
+  } catch (e) {
+    /* uh oh, print reftests may not work... */
+    logger.warning("Failed to set silent printing pref, EXCEPTION: " + e);
+  }
+
+  g.windowUtils = g.containingWindow.windowUtils;
+  if (!g.windowUtils || !g.windowUtils.compareCanvases)
+    throw "nsIDOMWindowUtils inteface missing";
+
+  g.ioService = Cc[IO_SERVICE_CONTRACTID].getService(Ci.nsIIOService);
+  g.debug = Cc[DEBUG_CONTRACTID].getService(Ci.nsIDebug2);
+
+  RegisterProcessCrashObservers();
+
+  if (g.remote) {
+    g.server = null;
+  } else {
+    g.server = new HttpServer();
+  }
+  try {
+    if (g.server) StartHTTPServer();
+  } catch (ex) {
+    //g.browser.loadURI('data:text/plain,' + ex);
+    ++g.testResults.Exception;
+    logger.error("EXCEPTION: " + ex);
+    DoneTests();
+  }
+
+  // Focus the content browser.
+  if (g.focusFilterMode != FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS) {
+    var fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
+    if (fm.activeWindow != g.containingWindow) {
+      Focus();
+    }
+    g.browser.addEventListener("focus", ReadTests, true);
+    g.browser.focus();
+  } else {
+    ReadTests();
+  }
+}
+
+function StartHTTPServer() {
+  g.server.registerContentType("sjs", "sjs");
+  g.server.start(-1);
+
+  g.server.identity.add("http", "example.org", "80");
+  g.server.identity.add("https", "example.org", "443");
+
+  const proxyFilter = {
+    proxyInfo: lazy.proxyService.newProxyInfo(
+      "http", // type of proxy
+      "localhost", //proxy host
+      g.server.identity.primaryPort, // proxy host port
+      "", // auth header
+      "", // isolation key
+      0, // flags
+      4096, // timeout
+      null // failover proxy
+    ),
+
+    applyFilter(channel, defaultProxyInfo, callback) {
+      if (channel.URI.host == "example.org") {
+        callback.onProxyFilterResult(this.proxyInfo);
+      } else {
+        callback.onProxyFilterResult(defaultProxyInfo);
       }
-      doc.appendChild(g.browser);
-      // TODO Bug 1156817: reftests don't have most of GeckoView infra so we
-      // can't register this actor
-      ChromeUtils.unregisterWindowActor("LoadURIDelegate");
-    } else {
-      document.getElementById("reftest-window").appendChild(g.browser);
-    }
+    },
+  };
 
-    g.browserMessageManager = g.browser.frameLoader.messageManager;
-    // The content script waits for the initial onload, then notifies
-    // us.
-    RegisterMessageListenersAndLoadContentScript(false);
-}
+  lazy.proxyService.registerChannelFilter(proxyFilter, 0);
 
-function InitAndStartRefTests()
-{
-    /* These prefs are optional, so we don't need to spit an error to the log */
-    try {
-        var prefs = Cc["@mozilla.org/preferences-service;1"].
-                    getService(Ci.nsIPrefBranch);
-    } catch(e) {
-        logger.error("EXCEPTION: " + e);
-    }
-
-    try {
-      prefs.setBoolPref("android.widget_paints_background", false);
-    } catch (e) {}
-
-    // If fission is enabled, then also put data: URIs in the default web process,
-    // since most reftests run in the file process, and this will make data:
-    // <iframe>s OOP.
-    if (g.browserIsFission) {
-      prefs.setBoolPref("browser.tabs.remote.dataUriInDefaultWebProcess", true);
-    }
-
-    /* set the g.loadTimeout */
-    try {
-        g.loadTimeout = prefs.getIntPref("reftest.timeout");
-    } catch(e) {
-        g.loadTimeout = 5 * 60 * 1000; //5 minutes as per bug 479518
-    }
-
-    /* Get the logfile for android tests */
-    try {
-        var logFile = prefs.getStringPref("reftest.logFile");
-        if (logFile) {
-            var f = FileUtils.File(logFile);
-            var out = FileUtils.openFileOutputStream(f, FileUtils.MODE_WRONLY | FileUtils.MODE_CREATE);
-            g.logFile = Cc["@mozilla.org/intl/converter-output-stream;1"]
-                          .createInstance(Ci.nsIConverterOutputStream);
-            g.logFile.init(out, null);
-        }
-    } catch(e) {}
-
-    g.remote = prefs.getBoolPref("reftest.remote", false);
-
-    g.ignoreWindowSize = prefs.getBoolPref("reftest.ignoreWindowSize", false);
-
-    /* Support for running a chunk (subset) of tests.  In separate try as this is optional */
-    try {
-        g.totalChunks = prefs.getIntPref("reftest.totalChunks");
-        g.thisChunk = prefs.getIntPref("reftest.thisChunk");
-    }
-    catch(e) {
-        g.totalChunks = 0;
-        g.thisChunk = 0;
-    }
-
-    try {
-        g.focusFilterMode = prefs.getStringPref("reftest.focusFilterMode");
-    } catch(e) {}
-
-    try {
-        g.isCoverageBuild = prefs.getBoolPref("reftest.isCoverageBuild");
-    } catch(e) {}
-
-    try {
-        g.compareRetainedDisplayLists = prefs.getBoolPref("reftest.compareRetainedDisplayLists");
-    } catch (e) {}
-
-    try {
-        // We have to set print.always_print_silent or a print dialog would
-        // appear for each print operation, which would interrupt the test run.
-        prefs.setBoolPref("print.always_print_silent", true);
-    } catch (e) {
-        /* uh oh, print reftests may not work... */
-        logger.warning("Failed to set silent printing pref, EXCEPTION: " + e);
-    }
-
-    g.windowUtils = g.containingWindow.windowUtils;
-    if (!g.windowUtils || !g.windowUtils.compareCanvases)
-        throw "nsIDOMWindowUtils inteface missing";
-
-    g.ioService = Cc[IO_SERVICE_CONTRACTID].getService(Ci.nsIIOService);
-    g.debug = Cc[DEBUG_CONTRACTID].getService(Ci.nsIDebug2);
-
-    RegisterProcessCrashObservers();
-
-    if (g.remote) {
-        g.server = null;
-    } else {
-        g.server = new HttpServer();
-    }
-    try {
-        if (g.server)
-            StartHTTPServer();
-    } catch (ex) {
-        //g.browser.loadURI('data:text/plain,' + ex);
-        ++g.testResults.Exception;
-        logger.error("EXCEPTION: " + ex);
-        DoneTests();
-    }
-
-    // Focus the content browser.
-    if (g.focusFilterMode != FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS) {
-        var fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
-        if (fm.activeWindow != g.containingWindow) {
-            Focus();
-        }
-        g.browser.addEventListener("focus", ReadTests, true);
-        g.browser.focus();
-    } else {
-        ReadTests();
-    }
-}
-
-function StartHTTPServer()
-{
-    g.server.registerContentType("sjs", "sjs");
-    g.server.start(-1);
-
-    g.server.identity.add("http", "example.org", "80");
-    g.server.identity.add("https", "example.org", "443");
-
-    const proxyFilter = {
-        proxyInfo: lazy.proxyService.newProxyInfo(
-            "http", // type of proxy
-            "localhost", //proxy host
-            g.server.identity.primaryPort, // proxy host port
-            "", // auth header
-            "", // isolation key
-            0, // flags
-            4096, // timeout
-            null // failover proxy
-        ),
-
-        applyFilter(channel, defaultProxyInfo, callback) {
-            if (channel.URI.host == "example.org") {
-                callback.onProxyFilterResult(this.proxyInfo);
-            } else {
-                callback.onProxyFilterResult(defaultProxyInfo);
-            }
-        },
-    };
-
-    lazy.proxyService.registerChannelFilter(proxyFilter, 0);
-
-    g.httpServerPort = g.server.identity.primaryPort;
+  g.httpServerPort = g.server.identity.primaryPort;
 }
 
 // Perform a Fisher-Yates shuffle of the array.
-function Shuffle(array)
-{
-    for (var i = array.length - 1; i > 0; i--) {
-        var j = Math.floor(Math.random() * (i + 1));
-        var temp = array[i];
-        array[i] = array[j];
-        array[j] = temp;
-    }
+function Shuffle(array) {
+  for (var i = array.length - 1; i > 0; i--) {
+    var j = Math.floor(Math.random() * (i + 1));
+    var temp = array[i];
+    array[i] = array[j];
+    array[j] = temp;
+  }
 }
 
 function ReadTests() {
-    try {
-        if (g.focusFilterMode != FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS) {
-            g.browser.removeEventListener("focus", ReadTests, true);
-        }
-
-        g.urls = [];
-        var prefs = Cc["@mozilla.org/preferences-service;1"].
-                    getService(Ci.nsIPrefBranch);
-
-        /* There are three modes implemented here:
-         * 1) reftest.manifests
-         * 2) reftest.manifests and reftest.manifests.dumpTests
-         * 3) reftest.tests
-         *
-         * The first will parse the specified manifests, then immediately
-         * run the tests. The second will parse the manifests, save the test
-         * objects to a file and exit. The third will load a file of test
-         * objects and run them.
-         *
-         * The latter two modes are used to pass test data back and forth
-         * with python harness.
-        */
-        let manifests = prefs.getStringPref("reftest.manifests", null);
-        let dumpTests = prefs.getStringPref("reftest.manifests.dumpTests", null);
-        let testList = prefs.getStringPref("reftest.tests", null);
-
-        if ((testList && manifests) || !(testList || manifests)) {
-            logger.error("Exactly one of reftest.manifests or reftest.tests must be specified.");
-            logger.debug("reftest.manifests is: " + manifests);
-            logger.error("reftest.tests is: " + testList);
-            DoneTests();
-        }
-
-        if (testList) {
-            logger.debug("Reading test objects from: " + testList);
-            let promise = IOUtils.readJSON(testList).then(function onSuccess(json) {
-                g.urls = json.map(CreateUrls);
-                StartTests();
-            }).catch(function onFailure(e) {
-                logger.error("Failed to load test objects: " + e);
-                DoneTests();
-            });
-        } else if (manifests) {
-            // Parse reftest manifests
-            logger.debug("Reading " + manifests.length + " manifests");
-            manifests = JSON.parse(manifests);
-            g.urlsFilterRegex = manifests[null];
-
-            var globalFilter = null;
-            if (manifests.hasOwnProperty("")) {
-                let filterAndId = manifests[""];
-                if (!Array.isArray(filterAndId)) {
-                    logger.error(`manifest[""] should be an array`);
-                    DoneTests();
-                }
-                if (filterAndId.length === 0) {
-                    logger.error(`manifest[""] should contain a filter pattern in the 1st item`);
-                    DoneTests();
-                }
-                let filter = filterAndId[0];
-                if (typeof filter !== "string") {
-                    logger.error(`The first item of manifest[""] should be a string`);
-                    DoneTests();
-                }
-                globalFilter = new RegExp(filter);
-                delete manifests[""];
-            }
-
-            var manifestURLs = Object.keys(manifests);
-
-            // Ensure we read manifests from higher up the directory tree first so that we
-            // process includes before reading the included manifest again
-            manifestURLs.sort(function(a,b) {return a.length - b.length})
-            manifestURLs.forEach(function(manifestURL) {
-                logger.info("Reading manifest " + manifestURL);
-                var manifestInfo = manifests[manifestURL];
-                var filter = manifestInfo[0] ? new RegExp(manifestInfo[0]) : null;
-                var manifestID = manifestInfo[1];
-                ReadTopManifest(manifestURL, [globalFilter, filter, false], manifestID);
-            });
-
-            if (dumpTests) {
-                logger.debug("Dumping test objects to file: " + dumpTests);
-                IOUtils.writeJSON(dumpTests, g.urls, { flush: true }).then(
-                  function onSuccess() {
-                    DoneTests();
-                  },
-                  function onFailure(reason) {
-                    logger.error("failed to write test data: " + reason);
-                    DoneTests();
-                  }
-                )
-            } else {
-                logger.debug("Running " + g.urls.length + " test objects");
-                g.manageSuite = true;
-                g.urls = g.urls.map(CreateUrls);
-                StartTests();
-            }
-        }
-    } catch(e) {
-        ++g.testResults.Exception;
-        logger.error("EXCEPTION: " + e);
-        DoneTests();
+  try {
+    if (g.focusFilterMode != FOCUS_FILTER_NON_NEEDS_FOCUS_TESTS) {
+      g.browser.removeEventListener("focus", ReadTests, true);
     }
+
+    g.urls = [];
+    var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+      Ci.nsIPrefBranch
+    );
+
+    /* There are three modes implemented here:
+     * 1) reftest.manifests
+     * 2) reftest.manifests and reftest.manifests.dumpTests
+     * 3) reftest.tests
+     *
+     * The first will parse the specified manifests, then immediately
+     * run the tests. The second will parse the manifests, save the test
+     * objects to a file and exit. The third will load a file of test
+     * objects and run them.
+     *
+     * The latter two modes are used to pass test data back and forth
+     * with python harness.
+     */
+    let manifests = prefs.getStringPref("reftest.manifests", null);
+    let dumpTests = prefs.getStringPref("reftest.manifests.dumpTests", null);
+    let testList = prefs.getStringPref("reftest.tests", null);
+
+    if ((testList && manifests) || !(testList || manifests)) {
+      logger.error(
+        "Exactly one of reftest.manifests or reftest.tests must be specified."
+      );
+      logger.debug("reftest.manifests is: " + manifests);
+      logger.error("reftest.tests is: " + testList);
+      DoneTests();
+    }
+
+    if (testList) {
+      logger.debug("Reading test objects from: " + testList);
+      let promise = IOUtils.readJSON(testList)
+        .then(function onSuccess(json) {
+          g.urls = json.map(CreateUrls);
+          StartTests();
+        })
+        .catch(function onFailure(e) {
+          logger.error("Failed to load test objects: " + e);
+          DoneTests();
+        });
+    } else if (manifests) {
+      // Parse reftest manifests
+      logger.debug("Reading " + manifests.length + " manifests");
+      manifests = JSON.parse(manifests);
+      g.urlsFilterRegex = manifests[null];
+
+      var globalFilter = null;
+      if (manifests.hasOwnProperty("")) {
+        let filterAndId = manifests[""];
+        if (!Array.isArray(filterAndId)) {
+          logger.error(`manifest[""] should be an array`);
+          DoneTests();
+        }
+        if (filterAndId.length === 0) {
+          logger.error(
+            `manifest[""] should contain a filter pattern in the 1st item`
+          );
+          DoneTests();
+        }
+        let filter = filterAndId[0];
+        if (typeof filter !== "string") {
+          logger.error(`The first item of manifest[""] should be a string`);
+          DoneTests();
+        }
+        globalFilter = new RegExp(filter);
+        delete manifests[""];
+      }
+
+      var manifestURLs = Object.keys(manifests);
+
+      // Ensure we read manifests from higher up the directory tree first so that we
+      // process includes before reading the included manifest again
+      manifestURLs.sort(function (a, b) {
+        return a.length - b.length;
+      });
+      manifestURLs.forEach(function (manifestURL) {
+        logger.info("Reading manifest " + manifestURL);
+        var manifestInfo = manifests[manifestURL];
+        var filter = manifestInfo[0] ? new RegExp(manifestInfo[0]) : null;
+        var manifestID = manifestInfo[1];
+        ReadTopManifest(manifestURL, [globalFilter, filter, false], manifestID);
+      });
+
+      if (dumpTests) {
+        logger.debug("Dumping test objects to file: " + dumpTests);
+        IOUtils.writeJSON(dumpTests, g.urls, { flush: true }).then(
+          function onSuccess() {
+            DoneTests();
+          },
+          function onFailure(reason) {
+            logger.error("failed to write test data: " + reason);
+            DoneTests();
+          }
+        );
+      } else {
+        logger.debug("Running " + g.urls.length + " test objects");
+        g.manageSuite = true;
+        g.urls = g.urls.map(CreateUrls);
+        StartTests();
+      }
+    }
+  } catch (e) {
+    ++g.testResults.Exception;
+    logger.error("EXCEPTION: " + e);
+    DoneTests();
+  }
 }
 
-function StartTests()
-{
-    /* These prefs are optional, so we don't need to spit an error to the log */
-    try {
-        var prefs = Cc["@mozilla.org/preferences-service;1"].
-                    getService(Ci.nsIPrefBranch);
-    } catch(e) {
-        logger.error("EXCEPTION: " + e);
+function StartTests() {
+  /* These prefs are optional, so we don't need to spit an error to the log */
+  try {
+    var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+      Ci.nsIPrefBranch
+    );
+  } catch (e) {
+    logger.error("EXCEPTION: " + e);
+  }
+
+  g.noCanvasCache = prefs.getIntPref("reftest.nocache", false);
+
+  g.shuffle = prefs.getBoolPref("reftest.shuffle", false);
+
+  g.runUntilFailure = prefs.getBoolPref("reftest.runUntilFailure", false);
+
+  g.verify = prefs.getBoolPref("reftest.verify", false);
+
+  g.cleanupPendingCrashes = prefs.getBoolPref(
+    "reftest.cleanupPendingCrashes",
+    false
+  );
+
+  // Check if there are any crash dump files from the startup procedure, before
+  // we start running the first test. Otherwise the first test might get
+  // blamed for producing a crash dump file when that was not the case.
+  CleanUpCrashDumpFiles();
+
+  // When we repeat this function is called again, so really only want to set
+  // g.repeat once.
+  if (g.repeat == null) {
+    g.repeat = prefs.getIntPref("reftest.repeat", 0);
+  }
+
+  g.runSlowTests = prefs.getIntPref("reftest.skipslowtests", false);
+
+  if (g.shuffle) {
+    g.noCanvasCache = true;
+  }
+
+  try {
+    BuildUseCounts();
+
+    // Filter tests which will be skipped to get a more even distribution when chunking
+    // tURLs is a temporary array containing all active tests
+    var tURLs = new Array();
+    for (var i = 0; i < g.urls.length; ++i) {
+      if (g.urls[i].skip) continue;
+
+      if (g.urls[i].needsFocus && !Focus()) continue;
+
+      if (g.urls[i].slow && !g.runSlowTests) continue;
+
+      tURLs.push(g.urls[i]);
     }
 
-    g.noCanvasCache = prefs.getIntPref("reftest.nocache", false);
+    var numActiveTests = tURLs.length;
 
-    g.shuffle = prefs.getBoolPref("reftest.shuffle", false);
+    if (g.totalChunks > 0 && g.thisChunk > 0) {
+      // Calculate start and end indices of this chunk if tURLs array were
+      // divided evenly
+      var testsPerChunk = tURLs.length / g.totalChunks;
+      var start = Math.round((g.thisChunk - 1) * testsPerChunk);
+      var end = Math.round(g.thisChunk * testsPerChunk);
+      numActiveTests = end - start;
 
-    g.runUntilFailure = prefs.getBoolPref("reftest.runUntilFailure", false);
+      // Map these indices onto the g.urls array. This avoids modifying the
+      // g.urls array which prevents skipped tests from showing up in the log
+      start = g.thisChunk == 1 ? 0 : g.urls.indexOf(tURLs[start]);
+      end =
+        g.thisChunk == g.totalChunks
+          ? g.urls.length
+          : g.urls.indexOf(tURLs[end + 1]) - 1;
 
-    g.verify = prefs.getBoolPref("reftest.verify", false);
+      logger.info(
+        "Running chunk " +
+          g.thisChunk +
+          " out of " +
+          g.totalChunks +
+          " chunks.  " +
+          "tests " +
+          (start + 1) +
+          "-" +
+          end +
+          "/" +
+          g.urls.length
+      );
 
-    g.cleanupPendingCrashes = prefs.getBoolPref("reftest.cleanupPendingCrashes", false);
-
-    // Check if there are any crash dump files from the startup procedure, before
-    // we start running the first test. Otherwise the first test might get
-    // blamed for producing a crash dump file when that was not the case.
-    CleanUpCrashDumpFiles();
-
-    // When we repeat this function is called again, so really only want to set
-    // g.repeat once.
-    if (g.repeat == null) {
-      g.repeat = prefs.getIntPref("reftest.repeat", 0);
+      g.urls = g.urls.slice(start, end);
     }
 
-    g.runSlowTests = prefs.getIntPref("reftest.skipslowtests", false);
+    if (g.manageSuite && !g.suiteStarted) {
+      var ids = {};
+      g.urls.forEach(function (test) {
+        if (!(test.manifestID in ids)) {
+          ids[test.manifestID] = [];
+        }
+        ids[test.manifestID].push(test.identifier);
+      });
+      var suite = prefs.getStringPref("reftest.suite", "reftest");
+      logger.suiteStart(ids, suite, {
+        skipped: g.urls.length - numActiveTests,
+      });
+      g.suiteStarted = true;
+    }
 
     if (g.shuffle) {
-        g.noCanvasCache = true;
+      Shuffle(g.urls);
     }
 
-    try {
-        BuildUseCounts();
+    g.totalTests = g.urls.length;
+    if (!g.totalTests && !g.verify && !g.repeat) throw "No tests to run";
 
-        // Filter tests which will be skipped to get a more even distribution when chunking
-        // tURLs is a temporary array containing all active tests
-        var tURLs = new Array();
-        for (var i = 0; i < g.urls.length; ++i) {
-            if (g.urls[i].skip)
-                continue;
+    g.uriCanvases = {};
 
-            if (g.urls[i].needsFocus && !Focus())
-                continue;
-
-            if (g.urls[i].slow && !g.runSlowTests)
-                continue;
-
-            tURLs.push(g.urls[i]);
-        }
-
-        var numActiveTests = tURLs.length;
-
-        if (g.totalChunks > 0 && g.thisChunk > 0) {
-            // Calculate start and end indices of this chunk if tURLs array were
-            // divided evenly
-            var testsPerChunk = tURLs.length / g.totalChunks;
-            var start = Math.round((g.thisChunk-1) * testsPerChunk);
-            var end = Math.round(g.thisChunk * testsPerChunk);
-            numActiveTests = end - start;
-
-            // Map these indices onto the g.urls array. This avoids modifying the
-            // g.urls array which prevents skipped tests from showing up in the log
-            start = g.thisChunk == 1 ? 0 : g.urls.indexOf(tURLs[start]);
-            end = g.thisChunk == g.totalChunks ? g.urls.length : g.urls.indexOf(tURLs[end + 1]) - 1;
-
-            logger.info("Running chunk " + g.thisChunk + " out of " + g.totalChunks + " chunks.  " +
-                "tests " + (start+1) + "-" + end + "/" + g.urls.length);
-
-            g.urls = g.urls.slice(start, end);
-        }
-
-        if (g.manageSuite && !g.suiteStarted) {
-            var ids = {};
-            g.urls.forEach(function(test) {
-                if (!(test.manifestID in ids)) {
-                    ids[test.manifestID] = [];
-                }
-                ids[test.manifestID].push(test.identifier);
-            });
-            var suite = prefs.getStringPref('reftest.suite', 'reftest');
-            logger.suiteStart(ids, suite, {"skipped": g.urls.length - numActiveTests});
-            g.suiteStarted = true
-        }
-
-        if (g.shuffle) {
-            Shuffle(g.urls);
-        }
-
-        g.totalTests = g.urls.length;
-        if (!g.totalTests && !g.verify && !g.repeat)
-            throw "No tests to run";
-
-        g.uriCanvases = {};
-
-        PerTestCoverageUtils.beforeTest()
-        .then(StartCurrentTest)
-        .catch(e => {
-            logger.error("EXCEPTION: " + e);
-            DoneTests();
-        });
-    } catch (ex) {
-        //g.browser.loadURI('data:text/plain,' + ex);
-        ++g.testResults.Exception;
-        logger.error("EXCEPTION: " + ex);
+    PerTestCoverageUtils.beforeTest()
+      .then(StartCurrentTest)
+      .catch(e => {
+        logger.error("EXCEPTION: " + e);
         DoneTests();
-    }
+      });
+  } catch (ex) {
+    //g.browser.loadURI('data:text/plain,' + ex);
+    ++g.testResults.Exception;
+    logger.error("EXCEPTION: " + ex);
+    DoneTests();
+  }
 }
 
-function OnRefTestUnload()
-{
+function OnRefTestUnload() {}
+
+function AddURIUseCount(uri) {
+  if (uri == null) return;
+
+  var spec = uri.spec;
+  if (spec in g.uriUseCounts) {
+    g.uriUseCounts[spec]++;
+  } else {
+    g.uriUseCounts[spec] = 1;
+  }
 }
 
-function AddURIUseCount(uri)
-{
-    if (uri == null)
-        return;
+function BuildUseCounts() {
+  if (g.noCanvasCache) {
+    return;
+  }
 
-    var spec = uri.spec;
-    if (spec in g.uriUseCounts) {
-        g.uriUseCounts[spec]++;
-    } else {
-        g.uriUseCounts[spec] = 1;
-    }
-}
-
-function BuildUseCounts()
-{
-    if (g.noCanvasCache) {
-        return;
-    }
-
-    g.uriUseCounts = {};
-    for (var i = 0; i < g.urls.length; ++i) {
-        var url = g.urls[i];
-        if (!url.skip &&
-            (url.type == TYPE_REFTEST_EQUAL ||
-             url.type == TYPE_REFTEST_NOTEQUAL)) {
-            if (url.prefSettings1.length == 0) {
-                AddURIUseCount(g.urls[i].url1);
-            }
-            if (url.prefSettings2.length == 0) {
-                AddURIUseCount(g.urls[i].url2);
-            }
-        }
+  g.uriUseCounts = {};
+  for (var i = 0; i < g.urls.length; ++i) {
+    var url = g.urls[i];
+    if (
+      !url.skip &&
+      (url.type == TYPE_REFTEST_EQUAL || url.type == TYPE_REFTEST_NOTEQUAL)
+    ) {
+      if (url.prefSettings1.length == 0) {
+        AddURIUseCount(g.urls[i].url1);
+      }
+      if (url.prefSettings2.length == 0) {
+        AddURIUseCount(g.urls[i].url2);
+      }
     }
+  }
 }
 
 // Return true iff this window is focused when this function returns.
-function Focus()
-{
-    var fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
-    fm.focusedWindow = g.containingWindow;
+function Focus() {
+  var fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
+  fm.focusedWindow = g.containingWindow;
 
-    try {
-        var dock = Cc["@mozilla.org/widget/macdocksupport;1"].getService(Ci.nsIMacDockSupport);
-        dock.activateApplication(true);
-    } catch(ex) {
-    }
+  try {
+    var dock = Cc["@mozilla.org/widget/macdocksupport;1"].getService(
+      Ci.nsIMacDockSupport
+    );
+    dock.activateApplication(true);
+  } catch (ex) {}
 
-    return true;
+  return true;
 }
 
-function Blur()
-{
-    // On non-remote reftests, this will transfer focus to the dummy window
-    // we created to hold focus for non-needs-focus tests.  Buggy tests
-    // (ones which require focus but don't request needs-focus) will then
-    // fail.
-    g.containingWindow.blur();
+function Blur() {
+  // On non-remote reftests, this will transfer focus to the dummy window
+  // we created to hold focus for non-needs-focus tests.  Buggy tests
+  // (ones which require focus but don't request needs-focus) will then
+  // fail.
+  g.containingWindow.blur();
 }
 
-async function StartCurrentTest()
-{
-    g.testLog = [];
+async function StartCurrentTest() {
+  g.testLog = [];
 
-    // make sure we don't run tests that are expected to kill the browser
-    while (g.urls.length > 0) {
-        var test = g.urls[0];
-        logger.testStart(test.identifier);
-        if (test.skip) {
-            ++g.testResults.Skip;
-            logger.testEnd(test.identifier, "SKIP");
-            g.urls.shift();
-        } else if (test.needsFocus && !Focus()) {
-            // FIXME: Marking this as a known fail is dangerous!  What
-            // if it starts failing all the time?
-            ++g.testResults.Skip;
-            logger.testEnd(test.identifier, "SKIP", null, "(COULDN'T GET FOCUS)");
-            g.urls.shift();
-        } else if (test.slow && !g.runSlowTests) {
-            ++g.testResults.Slow;
-            logger.testEnd(test.identifier, "SKIP", null, "(SLOW)");
-            g.urls.shift();
-        } else {
-            break;
-        }
-    }
-
-    if ((g.urls.length == 0 && g.repeat == 0) ||
-        (g.runUntilFailure && HasUnexpectedResult())) {
-        await RestoreChangedPreferences();
-        DoneTests();
-    } else if (g.urls.length == 0 && g.repeat > 0) {
-        // Repeat
-        g.repeat--;
-        ReadTests();
+  // make sure we don't run tests that are expected to kill the browser
+  while (g.urls.length > 0) {
+    var test = g.urls[0];
+    logger.testStart(test.identifier);
+    if (test.skip) {
+      ++g.testResults.Skip;
+      logger.testEnd(test.identifier, "SKIP");
+      g.urls.shift();
+    } else if (test.needsFocus && !Focus()) {
+      // FIXME: Marking this as a known fail is dangerous!  What
+      // if it starts failing all the time?
+      ++g.testResults.Skip;
+      logger.testEnd(test.identifier, "SKIP", null, "(COULDN'T GET FOCUS)");
+      g.urls.shift();
+    } else if (test.slow && !g.runSlowTests) {
+      ++g.testResults.Slow;
+      logger.testEnd(test.identifier, "SKIP", null, "(SLOW)");
+      g.urls.shift();
     } else {
-        if (g.urls[0].chaosMode) {
-            g.windowUtils.enterChaosMode();
-        }
-        if (!g.urls[0].needsFocus) {
-            Blur();
-        }
-        var currentTest = g.totalTests - g.urls.length;
-        g.containingWindow.document.title = "reftest: " + currentTest + " / " + g.totalTests +
-            " (" + Math.floor(100 * (currentTest / g.totalTests)) + "%)";
-        StartCurrentURI(URL_TARGET_TYPE_TEST);
+      break;
     }
+  }
+
+  if (
+    (g.urls.length == 0 && g.repeat == 0) ||
+    (g.runUntilFailure && HasUnexpectedResult())
+  ) {
+    await RestoreChangedPreferences();
+    DoneTests();
+  } else if (g.urls.length == 0 && g.repeat > 0) {
+    // Repeat
+    g.repeat--;
+    ReadTests();
+  } else {
+    if (g.urls[0].chaosMode) {
+      g.windowUtils.enterChaosMode();
+    }
+    if (!g.urls[0].needsFocus) {
+      Blur();
+    }
+    var currentTest = g.totalTests - g.urls.length;
+    g.containingWindow.document.title =
+      "reftest: " +
+      currentTest +
+      " / " +
+      g.totalTests +
+      " (" +
+      Math.floor(100 * (currentTest / g.totalTests)) +
+      "%)";
+    StartCurrentURI(URL_TARGET_TYPE_TEST);
+  }
 }
 
 // A simplified version of the function with the same name in tabbrowser.js.
@@ -739,8 +769,7 @@ function updateBrowserRemotenessByURL(aBrowser, aURL) {
   );
   // Things get confused if we switch to not-remote
   // for chrome:// URIs, so lets not for now.
-  if (remoteType == E10SUtils.NOT_REMOTE &&
-      g.browserIsRemote) {
+  if (remoteType == E10SUtils.NOT_REMOTE && g.browserIsRemote) {
     remoteType = aBrowser.remoteType;
   }
   if (aBrowser.remoteType != remoteType) {
@@ -756,7 +785,9 @@ function updateBrowserRemotenessByURL(aBrowser, aURL) {
 
     g.browserMessageManager = aBrowser.frameLoader.messageManager;
     RegisterMessageListenersAndLoadContentScript(true);
-    return new Promise(resolve => { g.resolveContentReady = resolve;  });
+    return new Promise(resolve => {
+      g.resolveContentReady = resolve;
+    });
   }
 
   return Promise.resolve();
@@ -764,193 +795,222 @@ function updateBrowserRemotenessByURL(aBrowser, aURL) {
 
 // This logic should match SpecialPowersParent._applyPrefs.
 function PrefRequiresRefresh(name) {
-  return name == "layout.css.prefers-color-scheme.content-override" ||
-         name.startsWith("ui.") ||
-         name.startsWith("browser.display.") ||
-         name.startsWith("font.");
+  return (
+    name == "layout.css.prefers-color-scheme.content-override" ||
+    name.startsWith("ui.") ||
+    name.startsWith("browser.display.") ||
+    name.startsWith("font.")
+  );
 }
 
-async function StartCurrentURI(aURLTargetType)
-{
-    const isStartingRef = (aURLTargetType == URL_TARGET_TYPE_REFERENCE);
+async function StartCurrentURI(aURLTargetType) {
+  const isStartingRef = aURLTargetType == URL_TARGET_TYPE_REFERENCE;
 
-    g.currentURL = g.urls[0][isStartingRef ? "url2" : "url1"].spec;
-    g.currentURLTargetType = aURLTargetType;
+  g.currentURL = g.urls[0][isStartingRef ? "url2" : "url1"].spec;
+  g.currentURLTargetType = aURLTargetType;
 
-    await RestoreChangedPreferences();
+  await RestoreChangedPreferences();
 
-    var prefs = Cc["@mozilla.org/preferences-service;1"].
-        getService(Ci.nsIPrefBranch);
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+    Ci.nsIPrefBranch
+  );
 
-    const prefSettings =
-      g.urls[0][isStartingRef ? "prefSettings2" : "prefSettings1"];
+  const prefSettings =
+    g.urls[0][isStartingRef ? "prefSettings2" : "prefSettings1"];
 
-    var prefsRequireRefresh = false;
+  var prefsRequireRefresh = false;
 
-    if (prefSettings.length > 0) {
-        var badPref = undefined;
+  if (prefSettings.length > 0) {
+    var badPref = undefined;
+    try {
+      prefSettings.forEach(function (ps) {
+        let prefExists = false;
         try {
-            prefSettings.forEach(function(ps) {
-                let prefExists = false;
-                try {
-                    let prefType = prefs.getPrefType(ps.name);
-                    prefExists = (prefType != prefs.PREF_INVALID);
-                } catch (e) {
-                }
-                if (!prefExists) {
-                    logger.info("Pref " + ps.name + " not found, will be added");
-                }
+          let prefType = prefs.getPrefType(ps.name);
+          prefExists = prefType != prefs.PREF_INVALID;
+        } catch (e) {}
+        if (!prefExists) {
+          logger.info("Pref " + ps.name + " not found, will be added");
+        }
 
-                let oldVal = undefined;
-                if (prefExists) {
-                    if (ps.type == PREF_BOOLEAN) {
-                        try {
-                            oldVal = prefs.getBoolPref(ps.name);
-                        } catch (e) {
-                            badPref = "boolean preference '" + ps.name + "'";
-                            throw "bad pref";
-                        }
-                    } else if (ps.type == PREF_STRING) {
-                        try {
-                            oldVal = prefs.getStringPref(ps.name);
-                        } catch (e) {
-                            badPref = "string preference '" + ps.name + "'";
-                            throw "bad pref";
-                        }
-                    } else if (ps.type == PREF_INTEGER) {
-                        try {
-                            oldVal = prefs.getIntPref(ps.name);
-                        } catch (e) {
-                            badPref = "integer preference '" + ps.name + "'";
-                            throw "bad pref";
-                        }
-                    } else {
-                        throw "internal error - unknown preference type";
-                    }
-                }
-                if (!prefExists || oldVal != ps.value) {
-                    var requiresRefresh = PrefRequiresRefresh(ps.name);
-                    prefsRequireRefresh = prefsRequireRefresh || requiresRefresh;
-                    g.prefsToRestore.push( { name: ps.name,
-                                             type: ps.type,
-                                             value: oldVal,
-                                             requiresRefresh,
-                                             prefExisted: prefExists } );
-                    var value = ps.value;
-                    if (ps.type == PREF_BOOLEAN) {
-                        prefs.setBoolPref(ps.name, value);
-                    } else if (ps.type == PREF_STRING) {
-                        prefs.setStringPref(ps.name, value);
-                        value = '"' + value + '"';
-                    } else if (ps.type == PREF_INTEGER) {
-                        prefs.setIntPref(ps.name, value);
-                    }
-                    logger.info("SET PREFERENCE pref(" + ps.name + "," + value + ")");
-                }
-            });
-        } catch (e) {
-            if (e == "bad pref") {
-                var test = g.urls[0];
-                if (test.expected == EXPECTED_FAIL) {
-                    logger.testEnd(test.identifier, "FAIL", "FAIL",
-                                   "(SKIPPED; " + badPref + " not known or wrong type)");
-                    ++g.testResults.Skip;
-                } else {
-                    logger.testEnd(test.identifier, "FAIL", "PASS",
-                                   badPref + " not known or wrong type");
-                    ++g.testResults.UnexpectedFail;
-                }
-
-                // skip the test that had a bad preference
-                g.urls.shift();
-                await StartCurrentTest();
-                return;
-            } else {
-                throw e;
+        let oldVal = undefined;
+        if (prefExists) {
+          if (ps.type == PREF_BOOLEAN) {
+            try {
+              oldVal = prefs.getBoolPref(ps.name);
+            } catch (e) {
+              badPref = "boolean preference '" + ps.name + "'";
+              throw "bad pref";
             }
+          } else if (ps.type == PREF_STRING) {
+            try {
+              oldVal = prefs.getStringPref(ps.name);
+            } catch (e) {
+              badPref = "string preference '" + ps.name + "'";
+              throw "bad pref";
+            }
+          } else if (ps.type == PREF_INTEGER) {
+            try {
+              oldVal = prefs.getIntPref(ps.name);
+            } catch (e) {
+              badPref = "integer preference '" + ps.name + "'";
+              throw "bad pref";
+            }
+          } else {
+            throw "internal error - unknown preference type";
+          }
         }
-    }
-
-    if (prefSettings.length == 0 &&
-        g.uriCanvases[g.currentURL] &&
-        (g.urls[0].type == TYPE_REFTEST_EQUAL ||
-         g.urls[0].type == TYPE_REFTEST_NOTEQUAL) &&
-        g.urls[0].maxAsserts == 0) {
-        // Pretend the document loaded --- RecordResult will notice
-        // there's already a canvas for this URL
-        g.containingWindow.setTimeout(RecordResult, 0);
-    } else {
-        var currentTest = g.totalTests - g.urls.length;
-        // Log this to preserve the same overall log format,
-        // should be removed if the format is updated
-        gDumpFn("REFTEST TEST-LOAD | " + g.currentURL + " | " + currentTest + " / " + g.totalTests +
-                " (" + Math.floor(100 * (currentTest / g.totalTests)) + "%)\n");
-        TestBuffer("START " + g.currentURL);
-        await updateBrowserRemotenessByURL(g.browser, g.currentURL);
-
-        if (prefsRequireRefresh) {
-            await new Promise(resolve => g.containingWindow.requestAnimationFrame(resolve));
+        if (!prefExists || oldVal != ps.value) {
+          var requiresRefresh = PrefRequiresRefresh(ps.name);
+          prefsRequireRefresh = prefsRequireRefresh || requiresRefresh;
+          g.prefsToRestore.push({
+            name: ps.name,
+            type: ps.type,
+            value: oldVal,
+            requiresRefresh,
+            prefExisted: prefExists,
+          });
+          var value = ps.value;
+          if (ps.type == PREF_BOOLEAN) {
+            prefs.setBoolPref(ps.name, value);
+          } else if (ps.type == PREF_STRING) {
+            prefs.setStringPref(ps.name, value);
+            value = '"' + value + '"';
+          } else if (ps.type == PREF_INTEGER) {
+            prefs.setIntPref(ps.name, value);
+          }
+          logger.info("SET PREFERENCE pref(" + ps.name + "," + value + ")");
         }
-
-        var type = g.urls[0].type
-        if (TYPE_SCRIPT == type) {
-            SendLoadScriptTest(g.currentURL, g.loadTimeout);
-        } else if (TYPE_PRINT == type) {
-            SendLoadPrintTest(g.currentURL, g.loadTimeout);
+      });
+    } catch (e) {
+      if (e == "bad pref") {
+        var test = g.urls[0];
+        if (test.expected == EXPECTED_FAIL) {
+          logger.testEnd(
+            test.identifier,
+            "FAIL",
+            "FAIL",
+            "(SKIPPED; " + badPref + " not known or wrong type)"
+          );
+          ++g.testResults.Skip;
         } else {
-            SendLoadTest(type, g.currentURL, g.currentURLTargetType, g.loadTimeout);
+          logger.testEnd(
+            test.identifier,
+            "FAIL",
+            "PASS",
+            badPref + " not known or wrong type"
+          );
+          ++g.testResults.UnexpectedFail;
         }
+
+        // skip the test that had a bad preference
+        g.urls.shift();
+        await StartCurrentTest();
+        return;
+      } else {
+        throw e;
+      }
     }
+  }
+
+  if (
+    prefSettings.length == 0 &&
+    g.uriCanvases[g.currentURL] &&
+    (g.urls[0].type == TYPE_REFTEST_EQUAL ||
+      g.urls[0].type == TYPE_REFTEST_NOTEQUAL) &&
+    g.urls[0].maxAsserts == 0
+  ) {
+    // Pretend the document loaded --- RecordResult will notice
+    // there's already a canvas for this URL
+    g.containingWindow.setTimeout(RecordResult, 0);
+  } else {
+    var currentTest = g.totalTests - g.urls.length;
+    // Log this to preserve the same overall log format,
+    // should be removed if the format is updated
+    gDumpFn(
+      "REFTEST TEST-LOAD | " +
+        g.currentURL +
+        " | " +
+        currentTest +
+        " / " +
+        g.totalTests +
+        " (" +
+        Math.floor(100 * (currentTest / g.totalTests)) +
+        "%)\n"
+    );
+    TestBuffer("START " + g.currentURL);
+    await updateBrowserRemotenessByURL(g.browser, g.currentURL);
+
+    if (prefsRequireRefresh) {
+      await new Promise(resolve =>
+        g.containingWindow.requestAnimationFrame(resolve)
+      );
+    }
+
+    var type = g.urls[0].type;
+    if (TYPE_SCRIPT == type) {
+      SendLoadScriptTest(g.currentURL, g.loadTimeout);
+    } else if (TYPE_PRINT == type) {
+      SendLoadPrintTest(g.currentURL, g.loadTimeout);
+    } else {
+      SendLoadTest(type, g.currentURL, g.currentURLTargetType, g.loadTimeout);
+    }
+  }
 }
 
-function DoneTests()
-{
-    PerTestCoverageUtils.afterTest()
+function DoneTests() {
+  PerTestCoverageUtils.afterTest()
     .catch(e => logger.error("EXCEPTION: " + e))
     .then(() => {
-        if (g.manageSuite) {
-            g.suiteStarted = false
-            logger.suiteEnd({'results': g.testResults});
-        } else {
-            logger.logData('results', {results: g.testResults});
-        }
-        logger.info("Slowest test took " + g.slowestTestTime + "ms (" + g.slowestTestURL + ")");
-        logger.info("Total canvas count = " + g.recycledCanvases.length);
-        if (g.failedUseWidgetLayers) {
-            LogWidgetLayersFailure();
-        }
+      if (g.manageSuite) {
+        g.suiteStarted = false;
+        logger.suiteEnd({ results: g.testResults });
+      } else {
+        logger.logData("results", { results: g.testResults });
+      }
+      logger.info(
+        "Slowest test took " +
+          g.slowestTestTime +
+          "ms (" +
+          g.slowestTestURL +
+          ")"
+      );
+      logger.info("Total canvas count = " + g.recycledCanvases.length);
+      if (g.failedUseWidgetLayers) {
+        LogWidgetLayersFailure();
+      }
 
-        function onStopped() {
-            if (g.logFile) {
-                g.logFile.close();
-                g.logFile = null;
-            }
-            let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);
-            appStartup.quit(Ci.nsIAppStartup.eForceQuit);
-        }
-        if (g.server) {
-            g.server.stop(onStopped);
-        }
-        else {
-            onStopped();
+      function onStopped() {
+        if (g.logFile) {
+          g.logFile.close();
+          g.logFile = null;
         }
+        let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(
+          Ci.nsIAppStartup
+        );
+        appStartup.quit(Ci.nsIAppStartup.eForceQuit);
+      }
+      if (g.server) {
+        g.server.stop(onStopped);
+      } else {
+        onStopped();
+      }
     });
 }
 
-function UpdateCanvasCache(url, canvas)
-{
-    var spec = url.spec;
+function UpdateCanvasCache(url, canvas) {
+  var spec = url.spec;
 
-    --g.uriUseCounts[spec];
+  --g.uriUseCounts[spec];
 
-    if (g.uriUseCounts[spec] == 0) {
-        ReleaseCanvas(canvas);
-        delete g.uriCanvases[spec];
-    } else if (g.uriUseCounts[spec] > 0) {
-        g.uriCanvases[spec] = canvas;
-    } else {
-        throw "Use counts were computed incorrectly";
-    }
+  if (g.uriUseCounts[spec] == 0) {
+    ReleaseCanvas(canvas);
+    delete g.uriCanvases[spec];
+  } else if (g.uriUseCounts[spec] > 0) {
+    g.uriCanvases[spec] = canvas;
+  } else {
+    throw "Use counts were computed incorrectly";
+  }
 }
 
 // Recompute drawWindow flags for every drawWindow operation.
@@ -958,948 +1018,1112 @@ function UpdateCanvasCache(url, canvas)
 // asynchronously resized (e.g. by the window manager, to make
 // it fit on screen) at unpredictable times.
 // Fortunately this is pretty cheap.
-async function DoDrawWindow(ctx, x, y, w, h)
-{
-    if (g.useDrawSnapshot) {
-      try {
-        let image = await g.browser.drawSnapshot(x, y, w, h, 1.0, "#fff");
-        ctx.drawImage(image, x, y);
-      } catch (ex) {
-        logger.error(g.currentURL + " | drawSnapshot failed: " + ex);
-        ++g.testResults.Exception;
-      }
-      return;
+async function DoDrawWindow(ctx, x, y, w, h) {
+  if (g.useDrawSnapshot) {
+    try {
+      let image = await g.browser.drawSnapshot(x, y, w, h, 1.0, "#fff");
+      ctx.drawImage(image, x, y);
+    } catch (ex) {
+      logger.error(g.currentURL + " | drawSnapshot failed: " + ex);
+      ++g.testResults.Exception;
     }
+    return;
+  }
 
-    var flags = ctx.DRAWWINDOW_DRAW_CARET | ctx.DRAWWINDOW_DRAW_VIEW;
-    var testRect = g.browser.getBoundingClientRect();
-    if (g.ignoreWindowSize ||
-        (0 <= testRect.left &&
-         0 <= testRect.top &&
-         g.containingWindow.innerWidth >= testRect.right &&
-         g.containingWindow.innerHeight >= testRect.bottom)) {
-        // We can use the window's retained layer manager
-        // because the window is big enough to display the entire
-        // browser element
-        flags |= ctx.DRAWWINDOW_USE_WIDGET_LAYERS;
-    } else if (g.browserIsRemote) {
-        logger.error(g.currentURL + " | can't drawWindow remote content");
-        ++g.testResults.Exception;
+  var flags = ctx.DRAWWINDOW_DRAW_CARET | ctx.DRAWWINDOW_DRAW_VIEW;
+  var testRect = g.browser.getBoundingClientRect();
+  if (
+    g.ignoreWindowSize ||
+    (0 <= testRect.left &&
+      0 <= testRect.top &&
+      g.containingWindow.innerWidth >= testRect.right &&
+      g.containingWindow.innerHeight >= testRect.bottom)
+  ) {
+    // We can use the window's retained layer manager
+    // because the window is big enough to display the entire
+    // browser element
+    flags |= ctx.DRAWWINDOW_USE_WIDGET_LAYERS;
+  } else if (g.browserIsRemote) {
+    logger.error(g.currentURL + " | can't drawWindow remote content");
+    ++g.testResults.Exception;
+  }
+
+  if (g.drawWindowFlags != flags) {
+    // Every time the flags change, dump the new state.
+    g.drawWindowFlags = flags;
+    var flagsStr = "DRAWWINDOW_DRAW_CARET | DRAWWINDOW_DRAW_VIEW";
+    if (flags & ctx.DRAWWINDOW_USE_WIDGET_LAYERS) {
+      flagsStr += " | DRAWWINDOW_USE_WIDGET_LAYERS";
+    } else {
+      // Output a special warning because we need to be able to detect
+      // this whenever it happens.
+      LogWidgetLayersFailure();
+      g.failedUseWidgetLayers = true;
     }
+    logger.info(
+      "drawWindow flags = " +
+        flagsStr +
+        "; window size = " +
+        g.containingWindow.innerWidth +
+        "," +
+        g.containingWindow.innerHeight +
+        "; test browser size = " +
+        testRect.width +
+        "," +
+        testRect.height
+    );
+  }
 
-    if (g.drawWindowFlags != flags) {
-        // Every time the flags change, dump the new state.
-        g.drawWindowFlags = flags;
-        var flagsStr = "DRAWWINDOW_DRAW_CARET | DRAWWINDOW_DRAW_VIEW";
-        if (flags & ctx.DRAWWINDOW_USE_WIDGET_LAYERS) {
-            flagsStr += " | DRAWWINDOW_USE_WIDGET_LAYERS";
-        } else {
-            // Output a special warning because we need to be able to detect
-            // this whenever it happens.
-            LogWidgetLayersFailure();
-            g.failedUseWidgetLayers = true;
-        }
-        logger.info("drawWindow flags = " + flagsStr +
-                    "; window size = " + g.containingWindow.innerWidth + "," + g.containingWindow.innerHeight +
-                    "; test browser size = " + testRect.width + "," + testRect.height);
-    }
-
-    TestBuffer("DoDrawWindow " + x + "," + y + "," + w + "," + h);
-    ctx.save();
-    ctx.translate(x, y);
-    ctx.drawWindow(g.containingWindow, x, y, w, h, "rgb(255,255,255)",
-                   g.drawWindowFlags);
-    ctx.restore();
+  TestBuffer("DoDrawWindow " + x + "," + y + "," + w + "," + h);
+  ctx.save();
+  ctx.translate(x, y);
+  ctx.drawWindow(
+    g.containingWindow,
+    x,
+    y,
+    w,
+    h,
+    "rgb(255,255,255)",
+    g.drawWindowFlags
+  );
+  ctx.restore();
 }
 
-async function InitCurrentCanvasWithSnapshot()
-{
-    TestBuffer("Initializing canvas snapshot");
+async function InitCurrentCanvasWithSnapshot() {
+  TestBuffer("Initializing canvas snapshot");
 
-    if (g.urls[0].type == TYPE_LOAD || g.urls[0].type == TYPE_SCRIPT || g.urls[0].type == TYPE_PRINT) {
-        // We don't want to snapshot this kind of test
-        return false;
-    }
+  if (
+    g.urls[0].type == TYPE_LOAD ||
+    g.urls[0].type == TYPE_SCRIPT ||
+    g.urls[0].type == TYPE_PRINT
+  ) {
+    // We don't want to snapshot this kind of test
+    return false;
+  }
 
-    if (!g.currentCanvas) {
-        g.currentCanvas = AllocateCanvas();
-    }
+  if (!g.currentCanvas) {
+    g.currentCanvas = AllocateCanvas();
+  }
 
-    var ctx = g.currentCanvas.getContext("2d");
-    await DoDrawWindow(ctx, 0, 0, g.currentCanvas.width, g.currentCanvas.height);
-    return true;
+  var ctx = g.currentCanvas.getContext("2d");
+  await DoDrawWindow(ctx, 0, 0, g.currentCanvas.width, g.currentCanvas.height);
+  return true;
 }
 
-async function UpdateCurrentCanvasForInvalidation(rects)
-{
-    TestBuffer("Updating canvas for invalidation");
+async function UpdateCurrentCanvasForInvalidation(rects) {
+  TestBuffer("Updating canvas for invalidation");
 
-    if (!g.currentCanvas) {
-        return;
-    }
+  if (!g.currentCanvas) {
+    return;
+  }
 
-    var ctx = g.currentCanvas.getContext("2d");
-    for (var i = 0; i < rects.length; ++i) {
-        var r = rects[i];
-        // Set left/top/right/bottom to pixel boundaries
-        var left = Math.floor(r.left);
-        var top = Math.floor(r.top);
-        var right = Math.ceil(r.right);
-        var bottom = Math.ceil(r.bottom);
+  var ctx = g.currentCanvas.getContext("2d");
+  for (var i = 0; i < rects.length; ++i) {
+    var r = rects[i];
+    // Set left/top/right/bottom to pixel boundaries
+    var left = Math.floor(r.left);
+    var top = Math.floor(r.top);
+    var right = Math.ceil(r.right);
+    var bottom = Math.ceil(r.bottom);
 
-        // Clamp the values to the canvas size
-        left = Math.max(0, Math.min(left, g.currentCanvas.width));
-        top = Math.max(0, Math.min(top, g.currentCanvas.height));
-        right = Math.max(0, Math.min(right, g.currentCanvas.width));
-        bottom = Math.max(0, Math.min(bottom, g.currentCanvas.height));
+    // Clamp the values to the canvas size
+    left = Math.max(0, Math.min(left, g.currentCanvas.width));
+    top = Math.max(0, Math.min(top, g.currentCanvas.height));
+    right = Math.max(0, Math.min(right, g.currentCanvas.width));
+    bottom = Math.max(0, Math.min(bottom, g.currentCanvas.height));
 
-        await DoDrawWindow(ctx, left, top, right - left, bottom - top);
-    }
+    await DoDrawWindow(ctx, left, top, right - left, bottom - top);
+  }
 }
 
-async function UpdateWholeCurrentCanvasForInvalidation()
-{
-    TestBuffer("Updating entire canvas for invalidation");
+async function UpdateWholeCurrentCanvasForInvalidation() {
+  TestBuffer("Updating entire canvas for invalidation");
 
-    if (!g.currentCanvas) {
-        return;
-    }
+  if (!g.currentCanvas) {
+    return;
+  }
 
-    var ctx = g.currentCanvas.getContext("2d");
-    await DoDrawWindow(ctx, 0, 0, g.currentCanvas.width, g.currentCanvas.height);
+  var ctx = g.currentCanvas.getContext("2d");
+  await DoDrawWindow(ctx, 0, 0, g.currentCanvas.width, g.currentCanvas.height);
 }
 
-function RecordResult(testRunTime, errorMsg, typeSpecificResults)
-{
-    TestBuffer("RecordResult fired");
+function RecordResult(testRunTime, errorMsg, typeSpecificResults) {
+  TestBuffer("RecordResult fired");
 
-    // Keep track of which test was slowest, and how long it took.
-    if (testRunTime > g.slowestTestTime) {
-        g.slowestTestTime = testRunTime;
-        g.slowestTestURL  = g.currentURL;
-    }
+  // Keep track of which test was slowest, and how long it took.
+  if (testRunTime > g.slowestTestTime) {
+    g.slowestTestTime = testRunTime;
+    g.slowestTestURL = g.currentURL;
+  }
 
-    // Not 'const ...' because of 'EXPECTED_*' value dependency.
-    var outputs = {};
-    outputs[EXPECTED_PASS] = {
-        true:  {s: ["PASS", "PASS"], n: "Pass"},
-        false: {s: ["FAIL", "PASS"], n: "UnexpectedFail"}
-    };
-    outputs[EXPECTED_FAIL] = {
-        true:  {s: ["PASS", "FAIL"], n: "UnexpectedPass"},
-        false: {s: ["FAIL", "FAIL"], n: "KnownFail"}
-    };
-    outputs[EXPECTED_RANDOM] = {
-        true:  {s: ["PASS", "PASS"], n: "Random"},
-        false: {s: ["FAIL", "FAIL"], n: "Random"}
-    };
-    // for EXPECTED_FUZZY we need special handling because we can have
-    // Pass, UnexpectedPass, or UnexpectedFail
+  // Not 'const ...' because of 'EXPECTED_*' value dependency.
+  var outputs = {};
+  outputs[EXPECTED_PASS] = {
+    true: { s: ["PASS", "PASS"], n: "Pass" },
+    false: { s: ["FAIL", "PASS"], n: "UnexpectedFail" },
+  };
+  outputs[EXPECTED_FAIL] = {
+    true: { s: ["PASS", "FAIL"], n: "UnexpectedPass" },
+    false: { s: ["FAIL", "FAIL"], n: "KnownFail" },
+  };
+  outputs[EXPECTED_RANDOM] = {
+    true: { s: ["PASS", "PASS"], n: "Random" },
+    false: { s: ["FAIL", "FAIL"], n: "Random" },
+  };
+  // for EXPECTED_FUZZY we need special handling because we can have
+  // Pass, UnexpectedPass, or UnexpectedFail
 
-    if ((g.currentURLTargetType == URL_TARGET_TYPE_TEST && g.urls[0].wrCapture.test) ||
-        (g.currentURLTargetType == URL_TARGET_TYPE_REFERENCE && g.urls[0].wrCapture.ref)) {
-      logger.info("Running webrender capture");
-      g.windowUtils.wrCapture();
-    }
+  if (
+    (g.currentURLTargetType == URL_TARGET_TYPE_TEST &&
+      g.urls[0].wrCapture.test) ||
+    (g.currentURLTargetType == URL_TARGET_TYPE_REFERENCE &&
+      g.urls[0].wrCapture.ref)
+  ) {
+    logger.info("Running webrender capture");
+    g.windowUtils.wrCapture();
+  }
 
-    var output;
-    var extra;
+  var output;
+  var extra;
 
-    if (g.urls[0].type == TYPE_LOAD) {
-        ++g.testResults.LoadOnly;
-        logger.testStatus(g.urls[0].identifier, "(LOAD ONLY)", "PASS", "PASS");
-        g.currentCanvas = null;
-        FinishTestItem();
-        return;
-    }
-    if (g.urls[0].type == TYPE_PRINT) {
-        switch (g.currentURLTargetType) {
-        case URL_TARGET_TYPE_TEST:
-            // First document has been loaded.
-            g.testPrintOutput = typeSpecificResults;
-            // Proceed to load the second document.
-            CleanUpCrashDumpFiles();
-            StartCurrentURI(URL_TARGET_TYPE_REFERENCE);
-            break;
-        case URL_TARGET_TYPE_REFERENCE:
-            let pathToTestPdf = g.testPrintOutput;
-            let pathToRefPdf = typeSpecificResults;
-            comparePdfs(pathToTestPdf, pathToRefPdf, function(error, results) {
-                let expected = g.urls[0].expected;
-                // TODO: We should complain here if results is empty!
-                // (If it's empty, we'll spuriously succeed, regardless of
-                // our expectations)
-                if (error) {
-                    output = outputs[expected][false];
-                    extra = { status_msg: output.n };
-                    ++g.testResults[output.n];
-                    logger.testEnd(g.urls[0].identifier, output.s[0], output.s[1],
-                                   error.message, null, extra);
-                } else {
-                    let outputPair = outputs[expected];
-                    if (expected === EXPECTED_FAIL) {
-                       let failureResults = results.filter(function (result) { return !result.passed });
-                       if (failureResults.length > 0) {
-                         // We got an expected failure. Let's get rid of the
-                         // passes from the results so we don't trigger
-                         // TEST_UNEXPECTED_PASS logging for those.
-                         results = failureResults;
-                       }
-                       // (else, we expected a failure but got none!
-                       // Leave results untouched so we can log them.)
-                    }
-                    results.forEach(function(result) {
-                        output = outputPair[result.passed];
-                        let extra = { status_msg: output.n };
-                        ++g.testResults[output.n];
-                        logger.testEnd(g.urls[0].identifier, output.s[0], output.s[1],
-                                       result.description, null, extra);
-                    });
-                }
-                FinishTestItem();
-            });
-            break;
-        default:
-            throw "Unexpected state.";
-        }
-        return;
-    }
-    if (g.urls[0].type == TYPE_SCRIPT) {
-        var expected = g.urls[0].expected;
-
-        if (errorMsg) {
-            // Force an unexpected failure to alert the test author to fix the test.
-            expected = EXPECTED_PASS;
-        } else if (typeSpecificResults.length == 0) {
-             // This failure may be due to a JavaScript Engine bug causing
-             // early termination of the test. If we do not allow silent
-             // failure, report an error.
-             if (!g.urls[0].allowSilentFail)
-                 errorMsg = "No test results reported. (SCRIPT)\n";
-             else
-                 logger.info("An expected silent failure occurred");
-        }
-
-        if (errorMsg) {
+  if (g.urls[0].type == TYPE_LOAD) {
+    ++g.testResults.LoadOnly;
+    logger.testStatus(g.urls[0].identifier, "(LOAD ONLY)", "PASS", "PASS");
+    g.currentCanvas = null;
+    FinishTestItem();
+    return;
+  }
+  if (g.urls[0].type == TYPE_PRINT) {
+    switch (g.currentURLTargetType) {
+      case URL_TARGET_TYPE_TEST:
+        // First document has been loaded.
+        g.testPrintOutput = typeSpecificResults;
+        // Proceed to load the second document.
+        CleanUpCrashDumpFiles();
+        StartCurrentURI(URL_TARGET_TYPE_REFERENCE);
+        break;
+      case URL_TARGET_TYPE_REFERENCE:
+        let pathToTestPdf = g.testPrintOutput;
+        let pathToRefPdf = typeSpecificResults;
+        comparePdfs(pathToTestPdf, pathToRefPdf, function (error, results) {
+          let expected = g.urls[0].expected;
+          // TODO: We should complain here if results is empty!
+          // (If it's empty, we'll spuriously succeed, regardless of
+          // our expectations)
+          if (error) {
             output = outputs[expected][false];
             extra = { status_msg: output.n };
             ++g.testResults[output.n];
-            logger.testStatus(g.urls[0].identifier, errorMsg, output.s[0], output.s[1], null, null, extra);
-            FinishTestItem();
-            return;
-        }
-
-        var anyFailed = typeSpecificResults.some(function(result) { return !result.passed; });
-        var outputPair;
-        if (anyFailed && expected == EXPECTED_FAIL) {
-            // If we're marked as expected to fail, and some (but not all) tests
-            // passed, treat those tests as though they were marked random
-            // (since we can't tell whether they were really intended to be
-            // marked failing or not).
-            outputPair = { true: outputs[EXPECTED_RANDOM][true],
-                           false: outputs[expected][false] };
-        } else {
-            outputPair = outputs[expected];
-        }
-        var index = 0;
-        typeSpecificResults.forEach(function(result) {
-                var output = outputPair[result.passed];
-                var extra = { status_msg: output.n };
-
-                ++g.testResults[output.n];
-                logger.testStatus(g.urls[0].identifier, result.description + " item " + (++index),
-                                  output.s[0], output.s[1], null, null, extra);
+            logger.testEnd(
+              g.urls[0].identifier,
+              output.s[0],
+              output.s[1],
+              error.message,
+              null,
+              extra
+            );
+          } else {
+            let outputPair = outputs[expected];
+            if (expected === EXPECTED_FAIL) {
+              let failureResults = results.filter(function (result) {
+                return !result.passed;
+              });
+              if (failureResults.length > 0) {
+                // We got an expected failure. Let's get rid of the
+                // passes from the results so we don't trigger
+                // TEST_UNEXPECTED_PASS logging for those.
+                results = failureResults;
+              }
+              // (else, we expected a failure but got none!
+              // Leave results untouched so we can log them.)
+            }
+            results.forEach(function (result) {
+              output = outputPair[result.passed];
+              let extra = { status_msg: output.n };
+              ++g.testResults[output.n];
+              logger.testEnd(
+                g.urls[0].identifier,
+                output.s[0],
+                output.s[1],
+                result.description,
+                null,
+                extra
+              );
             });
+          }
+          FinishTestItem();
+        });
+        break;
+      default:
+        throw "Unexpected state.";
+    }
+    return;
+  }
+  if (g.urls[0].type == TYPE_SCRIPT) {
+    var expected = g.urls[0].expected;
 
-        if (anyFailed && expected == EXPECTED_PASS) {
-            FlushTestBuffer();
-        }
-
-        FinishTestItem();
-        return;
+    if (errorMsg) {
+      // Force an unexpected failure to alert the test author to fix the test.
+      expected = EXPECTED_PASS;
+    } else if (typeSpecificResults.length == 0) {
+      // This failure may be due to a JavaScript Engine bug causing
+      // early termination of the test. If we do not allow silent
+      // failure, report an error.
+      if (!g.urls[0].allowSilentFail)
+        errorMsg = "No test results reported. (SCRIPT)\n";
+      else logger.info("An expected silent failure occurred");
     }
 
-    const isRecordingRef =
-      (g.currentURLTargetType == URL_TARGET_TYPE_REFERENCE);
-    const prefSettings =
-      g.urls[0][isRecordingRef ? "prefSettings2" : "prefSettings1"];
-
-    if (prefSettings.length == 0 && g.uriCanvases[g.currentURL]) {
-        g.currentCanvas = g.uriCanvases[g.currentURL];
-    }
-    if (g.currentCanvas == null) {
-        logger.error(g.currentURL, "program error managing snapshots");
-        ++g.testResults.Exception;
-    }
-    g[isRecordingRef ? "canvas2" : "canvas1"] = g.currentCanvas;
-    g.currentCanvas = null;
-
-    ResetRenderingState();
-
-    switch (g.currentURLTargetType) {
-        case URL_TARGET_TYPE_TEST:
-            // First document has been loaded.
-            // Proceed to load the second document.
-
-            CleanUpCrashDumpFiles();
-            StartCurrentURI(URL_TARGET_TYPE_REFERENCE);
-            break;
-        case URL_TARGET_TYPE_REFERENCE:
-            // Both documents have been loaded. Compare the renderings and see
-            // if the comparison result matches the expected result specified
-            // in the manifest.
-
-            // number of different pixels
-            var differences;
-            // whether the two renderings match:
-            var equal;
-            var maxDifference = {};
-            // whether the allowed fuzziness from the annotations is exceeded
-            // by the actual comparison results
-            var fuzz_exceeded = false;
-
-            // what is expected on this platform (PASS, FAIL, RANDOM, or FUZZY)
-            var expected = g.urls[0].expected;
-
-            differences = g.windowUtils.compareCanvases(g.canvas1, g.canvas2, maxDifference);
-
-            if (g.urls[0].noAutoFuzz) {
-                // Autofuzzing is disabled
-            } else if (isAndroidDevice() && maxDifference.value <= 2 && differences > 0) {
-                // Autofuzz for WR on Android physical devices: Reduce any
-                // maxDifference of 2 to 0, because we get a lot of off-by-ones
-                // and off-by-twos that are very random and hard to annotate.
-                // In cases where the difference on any pixel component is more
-                // than 2 we require manual annotation. Note that this applies
-                // to both == tests and != tests, so != tests don't
-                // inadvertently pass due to a random off-by-one pixel
-                // difference.
-                logger.info(`REFTEST wr-on-android dropping fuzz of (${maxDifference.value}, ${differences}) to (0, 0)`);
-                maxDifference.value = 0;
-                differences = 0;
-            }
-
-            equal = (differences == 0);
-
-            if (maxDifference.value > 0 && equal) {
-                throw "Inconsistent result from compareCanvases.";
-            }
-
-            if (expected == EXPECTED_FUZZY) {
-                logger.info(`REFTEST fuzzy test ` +
-                            `(${g.urls[0].fuzzyMinDelta}, ${g.urls[0].fuzzyMinPixels}) <= ` +
-                            `(${maxDifference.value}, ${differences}) <= ` +
-                            `(${g.urls[0].fuzzyMaxDelta}, ${g.urls[0].fuzzyMaxPixels})`);
-                fuzz_exceeded = maxDifference.value > g.urls[0].fuzzyMaxDelta ||
-                                differences > g.urls[0].fuzzyMaxPixels;
-                equal = !fuzz_exceeded &&
-                        maxDifference.value >= g.urls[0].fuzzyMinDelta &&
-                        differences >= g.urls[0].fuzzyMinPixels;
-            }
-
-            var failedExtraCheck = g.failedNoPaint || g.failedNoDisplayList || g.failedDisplayList || g.failedOpaqueLayer || g.failedAssignedLayer;
-
-            // whether the comparison result matches what is in the manifest
-            var test_passed = (equal == (g.urls[0].type == TYPE_REFTEST_EQUAL)) && !failedExtraCheck;
-
-            if (expected != EXPECTED_FUZZY) {
-                output = outputs[expected][test_passed];
-            } else if (test_passed) {
-                output = {s: ["PASS", "PASS"], n: "Pass"};
-            } else if (g.urls[0].type == TYPE_REFTEST_EQUAL &&
-                       !failedExtraCheck &&
-                       !fuzz_exceeded) {
-                // If we get here, that means we had an '==' type test where
-                // at least one of the actual difference values was below the
-                // allowed range, but nothing else was wrong. So let's produce
-                // UNEXPECTED-PASS in this scenario. Also, if we enter this
-                // branch, 'equal' must be false so let's assert that to guard
-                // against logic errors.
-                if (equal) {
-                    throw "Logic error in reftest.jsm fuzzy test handling!";
-                }
-                output = {s: ["PASS", "FAIL"], n: "UnexpectedPass"};
-            } else {
-                // In all other cases we fail the test
-                output = {s: ["FAIL", "PASS"], n: "UnexpectedFail"};
-            }
-            extra = { status_msg: output.n };
-
-            ++g.testResults[output.n];
-
-            // It's possible that we failed both an "extra check" and the normal comparison, but we don't
-            // have a way to annotate these separately, so just print an error for the extra check failures.
-            if (failedExtraCheck) {
-                var failures = [];
-                if (g.failedNoPaint) {
-                    failures.push("failed reftest-no-paint");
-                }
-                if (g.failedNoDisplayList) {
-                    failures.push("failed reftest-no-display-list");
-                }
-                if (g.failedDisplayList) {
-                    failures.push("failed reftest-display-list");
-                }
-                // The g.failed*Messages arrays will contain messages from both the test and the reference.
-                if (g.failedOpaqueLayer) {
-                    failures.push("failed reftest-opaque-layer: " + g.failedOpaqueLayerMessages.join(", "));
-                }
-                if (g.failedAssignedLayer) {
-                    failures.push("failed reftest-assigned-layer: " + g.failedAssignedLayerMessages.join(", "));
-                }
-                var failureString = failures.join(", ");
-                logger.testStatus(g.urls[0].identifier, failureString, output.s[0], output.s[1], null, null, extra);
-            } else {
-                var message = "image comparison, max difference: " + maxDifference.value +
-                              ", number of differing pixels: " + differences;
-                if (!test_passed && expected == EXPECTED_PASS ||
-                    !test_passed && expected == EXPECTED_FUZZY ||
-                    test_passed && expected == EXPECTED_FAIL) {
-                    if (!equal) {
-                        extra.max_difference = maxDifference.value;
-                        extra.differences = differences;
-                        var image1 = g.canvas1.toDataURL();
-                        var image2 = g.canvas2.toDataURL();
-                        extra.reftest_screenshots = [
-                            {url:g.urls[0].identifier[0],
-                             screenshot: image1.slice(image1.indexOf(",") + 1)},
-                            g.urls[0].identifier[1],
-                            {url:g.urls[0].identifier[2],
-                             screenshot: image2.slice(image2.indexOf(",") + 1)}
-                        ];
-                        extra.image1 = image1;
-                        extra.image2 = image2;
-                    } else {
-                        var image1 = g.canvas1.toDataURL();
-                        extra.reftest_screenshots = [
-                            {url:g.urls[0].identifier[0],
-                             screenshot: image1.slice(image1.indexOf(",") + 1)}
-                        ];
-                        extra.image1 = image1;
-                    }
-                }
-                logger.testStatus(g.urls[0].identifier, message, output.s[0], output.s[1], null, null, extra);
-
-                if (g.noCanvasCache) {
-                    ReleaseCanvas(g.canvas1);
-                    ReleaseCanvas(g.canvas2);
-                } else {
-                    if (g.urls[0].prefSettings1.length == 0) {
-                        UpdateCanvasCache(g.urls[0].url1, g.canvas1);
-                    }
-                    if (g.urls[0].prefSettings2.length == 0) {
-                        UpdateCanvasCache(g.urls[0].url2, g.canvas2);
-                    }
-                }
-            }
-
-            if ((!test_passed && expected == EXPECTED_PASS) || (test_passed && expected == EXPECTED_FAIL)) {
-                FlushTestBuffer();
-            }
-
-            CleanUpCrashDumpFiles();
-            FinishTestItem();
-            break;
-        default:
-            throw "Unexpected state.";
-    }
-}
-
-function LoadFailed(why)
-{
-    ++g.testResults.FailedLoad;
-    if (!why) {
-        // reftest-content.js sets an initial reason before it sets the
-        // timeout that will call us with the currently set reason, so we
-        // should never get here.  If we do then there's a logic error
-        // somewhere.  Perhaps tests are somehow running overlapped and the
-        // timeout for one test is not being cleared before the timeout for
-        // another is set?  Maybe there's some sort of race?
-        logger.error("load failed with unknown reason (we should always have a reason!)");
-    }
-    logger.testStatus(g.urls[0].identifier, "load failed: " + why, "FAIL", "PASS");
-    FlushTestBuffer();
-    FinishTestItem();
-}
-
-function RemoveExpectedCrashDumpFiles()
-{
-    if (g.expectingProcessCrash) {
-        for (let crashFilename of g.expectedCrashDumpFiles) {
-            let file = g.crashDumpDir.clone();
-            file.append(crashFilename);
-            if (file.exists()) {
-                file.remove(false);
-            }
-        }
-    }
-    g.expectedCrashDumpFiles.length = 0;
-}
-
-function FindUnexpectedCrashDumpFiles()
-{
-    if (!g.crashDumpDir.exists()) {
-        return;
+    if (errorMsg) {
+      output = outputs[expected][false];
+      extra = { status_msg: output.n };
+      ++g.testResults[output.n];
+      logger.testStatus(
+        g.urls[0].identifier,
+        errorMsg,
+        output.s[0],
+        output.s[1],
+        null,
+        null,
+        extra
+      );
+      FinishTestItem();
+      return;
     }
 
-    let entries = g.crashDumpDir.directoryEntries;
-    if (!entries) {
-        return;
-    }
-
-    let foundCrashDumpFile = false;
-    while (entries.hasMoreElements()) {
-        let file = entries.nextFile;
-        let path = String(file.path);
-        if (path.match(/\.(dmp|extra)$/) && !g.unexpectedCrashDumpFiles[path]) {
-            if (!foundCrashDumpFile) {
-                ++g.testResults.UnexpectedFail;
-                foundCrashDumpFile = true;
-                if (g.currentURL) {
-                    logger.testStatus(g.urls[0].identifier, "crash-check", "FAIL", "PASS", "This test left crash dumps behind, but we weren't expecting it to!");
-                } else {
-                    logger.error("Harness startup left crash dumps behind, but we weren't expecting it to!");
-                }
-            }
-            logger.info("Found unexpected crash dump file " + path);
-            g.unexpectedCrashDumpFiles[path] = true;
-        }
-    }
-}
-
-function RemovePendingCrashDumpFiles()
-{
-    if (!g.pendingCrashDumpDir.exists()) {
-        return;
-    }
-
-    let entries = g.pendingCrashDumpDir.directoryEntries;
-    while (entries.hasMoreElements()) {
-        let file = entries.nextFile;
-        if (file.isFile()) {
-          file.remove(false);
-          logger.info("This test left pending crash dumps; deleted "+file.path);
-        }
-    }
-}
-
-function CleanUpCrashDumpFiles()
-{
-    RemoveExpectedCrashDumpFiles();
-    FindUnexpectedCrashDumpFiles();
-    if (g.cleanupPendingCrashes) {
-      RemovePendingCrashDumpFiles();
-    }
-    g.expectingProcessCrash = false;
-}
-
-function FinishTestItem()
-{
-    logger.testEnd(g.urls[0].identifier, "OK");
-
-    // Replace document with BLANK_URL_FOR_CLEARING in case there are
-    // assertions when unloading.
-    logger.debug("Loading a blank page");
-    // After clearing, content will notify us of the assertion count
-    // and tests will continue.
-    SendClear();
-    g.failedNoPaint = false;
-    g.failedNoDisplayList = false;
-    g.failedDisplayList = false;
-    g.failedOpaqueLayer = false;
-    g.failedOpaqueLayerMessages = [];
-    g.failedAssignedLayer = false;
-    g.failedAssignedLayerMessages = [];
-}
-
-async function DoAssertionCheck(numAsserts)
-{
-    if (g.debug.isDebugBuild) {
-        if (g.browserIsRemote) {
-            // Count chrome-process asserts too when content is out of
-            // process.
-            var newAssertionCount = g.debug.assertionCount;
-            var numLocalAsserts = newAssertionCount - g.assertionCount;
-            g.assertionCount = newAssertionCount;
-
-            numAsserts += numLocalAsserts;
-        }
-
-        var minAsserts = g.urls[0].minAsserts;
-        var maxAsserts = g.urls[0].maxAsserts;
-
-        if (numAsserts < minAsserts) {
-            ++g.testResults.AssertionUnexpectedFixed;
-        } else if (numAsserts > maxAsserts) {
-            ++g.testResults.AssertionUnexpected;
-        } else if (numAsserts != 0) {
-            ++g.testResults.AssertionKnown;
-        }
-        logger.assertionCount(g.urls[0].identifier, numAsserts, minAsserts, maxAsserts);
-    }
-
-    if (g.urls[0].chaosMode) {
-        g.windowUtils.leaveChaosMode();
-    }
-
-    // And start the next test.
-    g.urls.shift();
-    await StartCurrentTest();
-}
-
-function ResetRenderingState()
-{
-    SendResetRenderingState();
-    // We would want to clear any viewconfig here, if we add support for it
-}
-
-async function RestoreChangedPreferences()
-{
-    if (!g.prefsToRestore.length) {
-        return;
-    }
-    var prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefBranch);
-    var requiresRefresh = false;
-    g.prefsToRestore.reverse();
-    g.prefsToRestore.forEach(function(ps) {
-        requiresRefresh = requiresRefresh || ps.requiresRefresh;
-        if (ps.prefExisted) {
-            var value = ps.value;
-            if (ps.type == PREF_BOOLEAN) {
-                prefs.setBoolPref(ps.name, value);
-            } else if (ps.type == PREF_STRING) {
-                prefs.setStringPref(ps.name, value);
-                value = '"' + value + '"';
-            } else if (ps.type == PREF_INTEGER) {
-                prefs.setIntPref(ps.name, value);
-            }
-            logger.info("RESTORE PREFERENCE pref(" + ps.name + "," + value + ")");
-        } else {
-            prefs.clearUserPref(ps.name);
-            logger.info("RESTORE PREFERENCE pref(" + ps.name + ", <no value set>) (clearing user pref)");
-        }
+    var anyFailed = typeSpecificResults.some(function (result) {
+      return !result.passed;
     });
-
-    g.prefsToRestore = [];
-
-    if (requiresRefresh) {
-        await new Promise(resolve => g.containingWindow.requestAnimationFrame(resolve));
-    }
-}
-
-function RegisterMessageListenersAndLoadContentScript(aReload)
-{
-    g.browserMessageManager.addMessageListener(
-        "reftest:AssertionCount",
-        function (m) { RecvAssertionCount(m.json.count); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:ContentReady",
-        function (m) { return RecvContentReady(m.data); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:Exception",
-        function (m) { RecvException(m.json.what) }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedLoad",
-        function (m) { RecvFailedLoad(m.json.why); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedNoPaint",
-        function (m) { RecvFailedNoPaint(); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedNoDisplayList",
-        function (m) { RecvFailedNoDisplayList(); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedDisplayList",
-        function (m) { RecvFailedDisplayList(); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedOpaqueLayer",
-        function (m) { RecvFailedOpaqueLayer(m.json.why); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:FailedAssignedLayer",
-        function (m) { RecvFailedAssignedLayer(m.json.why); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:InitCanvasWithSnapshot",
-        function (m) { RecvInitCanvasWithSnapshot(); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:Log",
-        function (m) { RecvLog(m.json.type, m.json.msg); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:ScriptResults",
-        function (m) { RecvScriptResults(m.json.runtimeMs, m.json.error, m.json.results); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:StartPrint",
-        function (m) { RecvStartPrint(m.json.isPrintSelection, m.json.printRange); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:PrintResult",
-        function (m) { RecvPrintResult(m.json.runtimeMs, m.json.status, m.json.fileName); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:TestDone",
-        function (m) { RecvTestDone(m.json.runtimeMs); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:UpdateCanvasForInvalidation",
-        function (m) { RecvUpdateCanvasForInvalidation(m.json.rects); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:UpdateWholeCanvasForInvalidation",
-        function (m) { RecvUpdateWholeCanvasForInvalidation(); }
-    );
-    g.browserMessageManager.addMessageListener(
-        "reftest:ExpectProcessCrash",
-        function (m) { RecvExpectProcessCrash(); }
-    );
-
-    g.browserMessageManager.loadFrameScript("resource://reftest/reftest-content.js", true, true);
-
-    if (aReload) {
-        return;
-    }
-
-    ChromeUtils.registerWindowActor("ReftestFission", {
-        parent: {
-          moduleURI: "resource://reftest/ReftestFissionParent.jsm",
-        },
-        child: {
-          moduleURI: "resource://reftest/ReftestFissionChild.jsm",
-          events: {
-            MozAfterPaint: {},
-          },
-        },
-        allFrames: true,
-        includeChrome: true,
-    });
-}
-
-async function RecvAssertionCount(count)
-{
-    await DoAssertionCheck(count);
-}
-
-function RecvContentReady(info)
-{
-    if (g.resolveContentReady) {
-      g.resolveContentReady();
-      g.resolveContentReady = null;
+    var outputPair;
+    if (anyFailed && expected == EXPECTED_FAIL) {
+      // If we're marked as expected to fail, and some (but not all) tests
+      // passed, treat those tests as though they were marked random
+      // (since we can't tell whether they were really intended to be
+      // marked failing or not).
+      outputPair = {
+        true: outputs[EXPECTED_RANDOM][true],
+        false: outputs[expected][false],
+      };
     } else {
-      g.contentGfxInfo = info.gfx;
-      InitAndStartRefTests();
+      outputPair = outputs[expected];
     }
-    return { remote: g.browserIsRemote };
-}
+    var index = 0;
+    typeSpecificResults.forEach(function (result) {
+      var output = outputPair[result.passed];
+      var extra = { status_msg: output.n };
 
-function RecvException(what)
-{
-    logger.error(g.currentURL + " | " + what);
+      ++g.testResults[output.n];
+      logger.testStatus(
+        g.urls[0].identifier,
+        result.description + " item " + ++index,
+        output.s[0],
+        output.s[1],
+        null,
+        null,
+        extra
+      );
+    });
+
+    if (anyFailed && expected == EXPECTED_PASS) {
+      FlushTestBuffer();
+    }
+
+    FinishTestItem();
+    return;
+  }
+
+  const isRecordingRef = g.currentURLTargetType == URL_TARGET_TYPE_REFERENCE;
+  const prefSettings =
+    g.urls[0][isRecordingRef ? "prefSettings2" : "prefSettings1"];
+
+  if (prefSettings.length == 0 && g.uriCanvases[g.currentURL]) {
+    g.currentCanvas = g.uriCanvases[g.currentURL];
+  }
+  if (g.currentCanvas == null) {
+    logger.error(g.currentURL, "program error managing snapshots");
     ++g.testResults.Exception;
+  }
+  g[isRecordingRef ? "canvas2" : "canvas1"] = g.currentCanvas;
+  g.currentCanvas = null;
+
+  ResetRenderingState();
+
+  switch (g.currentURLTargetType) {
+    case URL_TARGET_TYPE_TEST:
+      // First document has been loaded.
+      // Proceed to load the second document.
+
+      CleanUpCrashDumpFiles();
+      StartCurrentURI(URL_TARGET_TYPE_REFERENCE);
+      break;
+    case URL_TARGET_TYPE_REFERENCE:
+      // Both documents have been loaded. Compare the renderings and see
+      // if the comparison result matches the expected result specified
+      // in the manifest.
+
+      // number of different pixels
+      var differences;
+      // whether the two renderings match:
+      var equal;
+      var maxDifference = {};
+      // whether the allowed fuzziness from the annotations is exceeded
+      // by the actual comparison results
+      var fuzz_exceeded = false;
+
+      // what is expected on this platform (PASS, FAIL, RANDOM, or FUZZY)
+      var expected = g.urls[0].expected;
+
+      differences = g.windowUtils.compareCanvases(
+        g.canvas1,
+        g.canvas2,
+        maxDifference
+      );
+
+      if (g.urls[0].noAutoFuzz) {
+        // Autofuzzing is disabled
+      } else if (
+        isAndroidDevice() &&
+        maxDifference.value <= 2 &&
+        differences > 0
+      ) {
+        // Autofuzz for WR on Android physical devices: Reduce any
+        // maxDifference of 2 to 0, because we get a lot of off-by-ones
+        // and off-by-twos that are very random and hard to annotate.
+        // In cases where the difference on any pixel component is more
+        // than 2 we require manual annotation. Note that this applies
+        // to both == tests and != tests, so != tests don't
+        // inadvertently pass due to a random off-by-one pixel
+        // difference.
+        logger.info(
+          `REFTEST wr-on-android dropping fuzz of (${maxDifference.value}, ${differences}) to (0, 0)`
+        );
+        maxDifference.value = 0;
+        differences = 0;
+      }
+
+      equal = differences == 0;
+
+      if (maxDifference.value > 0 && equal) {
+        throw "Inconsistent result from compareCanvases.";
+      }
+
+      if (expected == EXPECTED_FUZZY) {
+        logger.info(
+          `REFTEST fuzzy test ` +
+            `(${g.urls[0].fuzzyMinDelta}, ${g.urls[0].fuzzyMinPixels}) <= ` +
+            `(${maxDifference.value}, ${differences}) <= ` +
+            `(${g.urls[0].fuzzyMaxDelta}, ${g.urls[0].fuzzyMaxPixels})`
+        );
+        fuzz_exceeded =
+          maxDifference.value > g.urls[0].fuzzyMaxDelta ||
+          differences > g.urls[0].fuzzyMaxPixels;
+        equal =
+          !fuzz_exceeded &&
+          maxDifference.value >= g.urls[0].fuzzyMinDelta &&
+          differences >= g.urls[0].fuzzyMinPixels;
+      }
+
+      var failedExtraCheck =
+        g.failedNoPaint ||
+        g.failedNoDisplayList ||
+        g.failedDisplayList ||
+        g.failedOpaqueLayer ||
+        g.failedAssignedLayer;
+
+      // whether the comparison result matches what is in the manifest
+      var test_passed =
+        equal == (g.urls[0].type == TYPE_REFTEST_EQUAL) && !failedExtraCheck;
+
+      if (expected != EXPECTED_FUZZY) {
+        output = outputs[expected][test_passed];
+      } else if (test_passed) {
+        output = { s: ["PASS", "PASS"], n: "Pass" };
+      } else if (
+        g.urls[0].type == TYPE_REFTEST_EQUAL &&
+        !failedExtraCheck &&
+        !fuzz_exceeded
+      ) {
+        // If we get here, that means we had an '==' type test where
+        // at least one of the actual difference values was below the
+        // allowed range, but nothing else was wrong. So let's produce
+        // UNEXPECTED-PASS in this scenario. Also, if we enter this
+        // branch, 'equal' must be false so let's assert that to guard
+        // against logic errors.
+        if (equal) {
+          throw "Logic error in reftest.jsm fuzzy test handling!";
+        }
+        output = { s: ["PASS", "FAIL"], n: "UnexpectedPass" };
+      } else {
+        // In all other cases we fail the test
+        output = { s: ["FAIL", "PASS"], n: "UnexpectedFail" };
+      }
+      extra = { status_msg: output.n };
+
+      ++g.testResults[output.n];
+
+      // It's possible that we failed both an "extra check" and the normal comparison, but we don't
+      // have a way to annotate these separately, so just print an error for the extra check failures.
+      if (failedExtraCheck) {
+        var failures = [];
+        if (g.failedNoPaint) {
+          failures.push("failed reftest-no-paint");
+        }
+        if (g.failedNoDisplayList) {
+          failures.push("failed reftest-no-display-list");
+        }
+        if (g.failedDisplayList) {
+          failures.push("failed reftest-display-list");
+        }
+        // The g.failed*Messages arrays will contain messages from both the test and the reference.
+        if (g.failedOpaqueLayer) {
+          failures.push(
+            "failed reftest-opaque-layer: " +
+              g.failedOpaqueLayerMessages.join(", ")
+          );
+        }
+        if (g.failedAssignedLayer) {
+          failures.push(
+            "failed reftest-assigned-layer: " +
+              g.failedAssignedLayerMessages.join(", ")
+          );
+        }
+        var failureString = failures.join(", ");
+        logger.testStatus(
+          g.urls[0].identifier,
+          failureString,
+          output.s[0],
+          output.s[1],
+          null,
+          null,
+          extra
+        );
+      } else {
+        var message =
+          "image comparison, max difference: " +
+          maxDifference.value +
+          ", number of differing pixels: " +
+          differences;
+        if (
+          (!test_passed && expected == EXPECTED_PASS) ||
+          (!test_passed && expected == EXPECTED_FUZZY) ||
+          (test_passed && expected == EXPECTED_FAIL)
+        ) {
+          if (!equal) {
+            extra.max_difference = maxDifference.value;
+            extra.differences = differences;
+            var image1 = g.canvas1.toDataURL();
+            var image2 = g.canvas2.toDataURL();
+            extra.reftest_screenshots = [
+              {
+                url: g.urls[0].identifier[0],
+                screenshot: image1.slice(image1.indexOf(",") + 1),
+              },
+              g.urls[0].identifier[1],
+              {
+                url: g.urls[0].identifier[2],
+                screenshot: image2.slice(image2.indexOf(",") + 1),
+              },
+            ];
+            extra.image1 = image1;
+            extra.image2 = image2;
+          } else {
+            var image1 = g.canvas1.toDataURL();
+            extra.reftest_screenshots = [
+              {
+                url: g.urls[0].identifier[0],
+                screenshot: image1.slice(image1.indexOf(",") + 1),
+              },
+            ];
+            extra.image1 = image1;
+          }
+        }
+        logger.testStatus(
+          g.urls[0].identifier,
+          message,
+          output.s[0],
+          output.s[1],
+          null,
+          null,
+          extra
+        );
+
+        if (g.noCanvasCache) {
+          ReleaseCanvas(g.canvas1);
+          ReleaseCanvas(g.canvas2);
+        } else {
+          if (g.urls[0].prefSettings1.length == 0) {
+            UpdateCanvasCache(g.urls[0].url1, g.canvas1);
+          }
+          if (g.urls[0].prefSettings2.length == 0) {
+            UpdateCanvasCache(g.urls[0].url2, g.canvas2);
+          }
+        }
+      }
+
+      if (
+        (!test_passed && expected == EXPECTED_PASS) ||
+        (test_passed && expected == EXPECTED_FAIL)
+      ) {
+        FlushTestBuffer();
+      }
+
+      CleanUpCrashDumpFiles();
+      FinishTestItem();
+      break;
+    default:
+      throw "Unexpected state.";
+  }
 }
 
-function RecvFailedLoad(why)
-{
-    LoadFailed(why);
+function LoadFailed(why) {
+  ++g.testResults.FailedLoad;
+  if (!why) {
+    // reftest-content.js sets an initial reason before it sets the
+    // timeout that will call us with the currently set reason, so we
+    // should never get here.  If we do then there's a logic error
+    // somewhere.  Perhaps tests are somehow running overlapped and the
+    // timeout for one test is not being cleared before the timeout for
+    // another is set?  Maybe there's some sort of race?
+    logger.error(
+      "load failed with unknown reason (we should always have a reason!)"
+    );
+  }
+  logger.testStatus(
+    g.urls[0].identifier,
+    "load failed: " + why,
+    "FAIL",
+    "PASS"
+  );
+  FlushTestBuffer();
+  FinishTestItem();
 }
 
-function RecvFailedNoPaint()
-{
-    g.failedNoPaint = true;
+function RemoveExpectedCrashDumpFiles() {
+  if (g.expectingProcessCrash) {
+    for (let crashFilename of g.expectedCrashDumpFiles) {
+      let file = g.crashDumpDir.clone();
+      file.append(crashFilename);
+      if (file.exists()) {
+        file.remove(false);
+      }
+    }
+  }
+  g.expectedCrashDumpFiles.length = 0;
 }
 
-function RecvFailedNoDisplayList()
-{
-    g.failedNoDisplayList = true;
+function FindUnexpectedCrashDumpFiles() {
+  if (!g.crashDumpDir.exists()) {
+    return;
+  }
+
+  let entries = g.crashDumpDir.directoryEntries;
+  if (!entries) {
+    return;
+  }
+
+  let foundCrashDumpFile = false;
+  while (entries.hasMoreElements()) {
+    let file = entries.nextFile;
+    let path = String(file.path);
+    if (path.match(/\.(dmp|extra)$/) && !g.unexpectedCrashDumpFiles[path]) {
+      if (!foundCrashDumpFile) {
+        ++g.testResults.UnexpectedFail;
+        foundCrashDumpFile = true;
+        if (g.currentURL) {
+          logger.testStatus(
+            g.urls[0].identifier,
+            "crash-check",
+            "FAIL",
+            "PASS",
+            "This test left crash dumps behind, but we weren't expecting it to!"
+          );
+        } else {
+          logger.error(
+            "Harness startup left crash dumps behind, but we weren't expecting it to!"
+          );
+        }
+      }
+      logger.info("Found unexpected crash dump file " + path);
+      g.unexpectedCrashDumpFiles[path] = true;
+    }
+  }
 }
 
-function RecvFailedDisplayList()
-{
-    g.failedDisplayList = true;
+function RemovePendingCrashDumpFiles() {
+  if (!g.pendingCrashDumpDir.exists()) {
+    return;
+  }
+
+  let entries = g.pendingCrashDumpDir.directoryEntries;
+  while (entries.hasMoreElements()) {
+    let file = entries.nextFile;
+    if (file.isFile()) {
+      file.remove(false);
+      logger.info("This test left pending crash dumps; deleted " + file.path);
+    }
+  }
+}
+
+function CleanUpCrashDumpFiles() {
+  RemoveExpectedCrashDumpFiles();
+  FindUnexpectedCrashDumpFiles();
+  if (g.cleanupPendingCrashes) {
+    RemovePendingCrashDumpFiles();
+  }
+  g.expectingProcessCrash = false;
+}
+
+function FinishTestItem() {
+  logger.testEnd(g.urls[0].identifier, "OK");
+
+  // Replace document with BLANK_URL_FOR_CLEARING in case there are
+  // assertions when unloading.
+  logger.debug("Loading a blank page");
+  // After clearing, content will notify us of the assertion count
+  // and tests will continue.
+  SendClear();
+  g.failedNoPaint = false;
+  g.failedNoDisplayList = false;
+  g.failedDisplayList = false;
+  g.failedOpaqueLayer = false;
+  g.failedOpaqueLayerMessages = [];
+  g.failedAssignedLayer = false;
+  g.failedAssignedLayerMessages = [];
+}
+
+async function DoAssertionCheck(numAsserts) {
+  if (g.debug.isDebugBuild) {
+    if (g.browserIsRemote) {
+      // Count chrome-process asserts too when content is out of
+      // process.
+      var newAssertionCount = g.debug.assertionCount;
+      var numLocalAsserts = newAssertionCount - g.assertionCount;
+      g.assertionCount = newAssertionCount;
+
+      numAsserts += numLocalAsserts;
+    }
+
+    var minAsserts = g.urls[0].minAsserts;
+    var maxAsserts = g.urls[0].maxAsserts;
+
+    if (numAsserts < minAsserts) {
+      ++g.testResults.AssertionUnexpectedFixed;
+    } else if (numAsserts > maxAsserts) {
+      ++g.testResults.AssertionUnexpected;
+    } else if (numAsserts != 0) {
+      ++g.testResults.AssertionKnown;
+    }
+    logger.assertionCount(
+      g.urls[0].identifier,
+      numAsserts,
+      minAsserts,
+      maxAsserts
+    );
+  }
+
+  if (g.urls[0].chaosMode) {
+    g.windowUtils.leaveChaosMode();
+  }
+
+  // And start the next test.
+  g.urls.shift();
+  await StartCurrentTest();
+}
+
+function ResetRenderingState() {
+  SendResetRenderingState();
+  // We would want to clear any viewconfig here, if we add support for it
+}
+
+async function RestoreChangedPreferences() {
+  if (!g.prefsToRestore.length) {
+    return;
+  }
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+    Ci.nsIPrefBranch
+  );
+  var requiresRefresh = false;
+  g.prefsToRestore.reverse();
+  g.prefsToRestore.forEach(function (ps) {
+    requiresRefresh = requiresRefresh || ps.requiresRefresh;
+    if (ps.prefExisted) {
+      var value = ps.value;
+      if (ps.type == PREF_BOOLEAN) {
+        prefs.setBoolPref(ps.name, value);
+      } else if (ps.type == PREF_STRING) {
+        prefs.setStringPref(ps.name, value);
+        value = '"' + value + '"';
+      } else if (ps.type == PREF_INTEGER) {
+        prefs.setIntPref(ps.name, value);
+      }
+      logger.info("RESTORE PREFERENCE pref(" + ps.name + "," + value + ")");
+    } else {
+      prefs.clearUserPref(ps.name);
+      logger.info(
+        "RESTORE PREFERENCE pref(" +
+          ps.name +
+          ", <no value set>) (clearing user pref)"
+      );
+    }
+  });
+
+  g.prefsToRestore = [];
+
+  if (requiresRefresh) {
+    await new Promise(resolve =>
+      g.containingWindow.requestAnimationFrame(resolve)
+    );
+  }
+}
+
+function RegisterMessageListenersAndLoadContentScript(aReload) {
+  g.browserMessageManager.addMessageListener(
+    "reftest:AssertionCount",
+    function (m) {
+      RecvAssertionCount(m.json.count);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:ContentReady",
+    function (m) {
+      return RecvContentReady(m.data);
+    }
+  );
+  g.browserMessageManager.addMessageListener("reftest:Exception", function (m) {
+    RecvException(m.json.what);
+  });
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedLoad",
+    function (m) {
+      RecvFailedLoad(m.json.why);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedNoPaint",
+    function (m) {
+      RecvFailedNoPaint();
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedNoDisplayList",
+    function (m) {
+      RecvFailedNoDisplayList();
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedDisplayList",
+    function (m) {
+      RecvFailedDisplayList();
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedOpaqueLayer",
+    function (m) {
+      RecvFailedOpaqueLayer(m.json.why);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:FailedAssignedLayer",
+    function (m) {
+      RecvFailedAssignedLayer(m.json.why);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:InitCanvasWithSnapshot",
+    function (m) {
+      RecvInitCanvasWithSnapshot();
+    }
+  );
+  g.browserMessageManager.addMessageListener("reftest:Log", function (m) {
+    RecvLog(m.json.type, m.json.msg);
+  });
+  g.browserMessageManager.addMessageListener(
+    "reftest:ScriptResults",
+    function (m) {
+      RecvScriptResults(m.json.runtimeMs, m.json.error, m.json.results);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:StartPrint",
+    function (m) {
+      RecvStartPrint(m.json.isPrintSelection, m.json.printRange);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:PrintResult",
+    function (m) {
+      RecvPrintResult(m.json.runtimeMs, m.json.status, m.json.fileName);
+    }
+  );
+  g.browserMessageManager.addMessageListener("reftest:TestDone", function (m) {
+    RecvTestDone(m.json.runtimeMs);
+  });
+  g.browserMessageManager.addMessageListener(
+    "reftest:UpdateCanvasForInvalidation",
+    function (m) {
+      RecvUpdateCanvasForInvalidation(m.json.rects);
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:UpdateWholeCanvasForInvalidation",
+    function (m) {
+      RecvUpdateWholeCanvasForInvalidation();
+    }
+  );
+  g.browserMessageManager.addMessageListener(
+    "reftest:ExpectProcessCrash",
+    function (m) {
+      RecvExpectProcessCrash();
+    }
+  );
+
+  g.browserMessageManager.loadFrameScript(
+    "resource://reftest/reftest-content.js",
+    true,
+    true
+  );
+
+  if (aReload) {
+    return;
+  }
+
+  ChromeUtils.registerWindowActor("ReftestFission", {
+    parent: {
+      moduleURI: "resource://reftest/ReftestFissionParent.jsm",
+    },
+    child: {
+      moduleURI: "resource://reftest/ReftestFissionChild.jsm",
+      events: {
+        MozAfterPaint: {},
+      },
+    },
+    allFrames: true,
+    includeChrome: true,
+  });
+}
+
+async function RecvAssertionCount(count) {
+  await DoAssertionCheck(count);
+}
+
+function RecvContentReady(info) {
+  if (g.resolveContentReady) {
+    g.resolveContentReady();
+    g.resolveContentReady = null;
+  } else {
+    g.contentGfxInfo = info.gfx;
+    InitAndStartRefTests();
+  }
+  return { remote: g.browserIsRemote };
+}
+
+function RecvException(what) {
+  logger.error(g.currentURL + " | " + what);
+  ++g.testResults.Exception;
+}
+
+function RecvFailedLoad(why) {
+  LoadFailed(why);
+}
+
+function RecvFailedNoPaint() {
+  g.failedNoPaint = true;
+}
+
+function RecvFailedNoDisplayList() {
+  g.failedNoDisplayList = true;
+}
+
+function RecvFailedDisplayList() {
+  g.failedDisplayList = true;
 }
 
 function RecvFailedOpaqueLayer(why) {
-    g.failedOpaqueLayer = true;
-    g.failedOpaqueLayerMessages.push(why);
+  g.failedOpaqueLayer = true;
+  g.failedOpaqueLayerMessages.push(why);
 }
 
 function RecvFailedAssignedLayer(why) {
-    g.failedAssignedLayer = true;
-    g.failedAssignedLayerMessages.push(why);
+  g.failedAssignedLayer = true;
+  g.failedAssignedLayerMessages.push(why);
 }
 
-async function RecvInitCanvasWithSnapshot()
-{
-    var painted = await InitCurrentCanvasWithSnapshot();
-    SendUpdateCurrentCanvasWithSnapshotDone(painted);
+async function RecvInitCanvasWithSnapshot() {
+  var painted = await InitCurrentCanvasWithSnapshot();
+  SendUpdateCurrentCanvasWithSnapshotDone(painted);
 }
 
-function RecvLog(type, msg)
-{
-    msg = "[CONTENT] " + msg;
-    if (type == "info") {
-        TestBuffer(msg);
-    } else if (type == "warning") {
-        logger.warning(msg);
-    } else if (type == "error") {
-        logger.error("REFTEST TEST-UNEXPECTED-FAIL | " + g.currentURL + " | " + msg + "\n");
-        ++g.testResults.Exception;
-    } else {
-        logger.error("REFTEST TEST-UNEXPECTED-FAIL | " + g.currentURL + " | unknown log type " + type + "\n");
-        ++g.testResults.Exception;
-    }
-}
-
-function RecvScriptResults(runtimeMs, error, results)
-{
-    RecordResult(runtimeMs, error, results);
-}
-
-function RecvStartPrint(isPrintSelection, printRange)
-{
-    let fileName =`reftest-print-${Date.now()}-`;
-    crypto.getRandomValues(new Uint8Array(4)).forEach(x => fileName += x.toString(16));
-    fileName += ".pdf"
-    let file = Services.dirsvc.get("TmpD", Ci.nsIFile);
-    file.append(fileName);
-
-    let PSSVC = Cc["@mozilla.org/gfx/printsettings-service;1"].getService(Ci.nsIPrintSettingsService);
-    let ps = PSSVC.createNewPrintSettings();
-    ps.printSilent = true;
-    ps.printBGImages = true;
-    ps.printBGColors = true;
-    ps.unwriteableMarginTop = 0;
-    ps.unwriteableMarginRight = 0;
-    ps.unwriteableMarginLeft = 0;
-    ps.unwriteableMarginBottom = 0;
-    ps.outputDestination = Ci.nsIPrintSettings.kOutputDestinationFile;
-    ps.toFileName = file.path;
-    ps.outputFormat = Ci.nsIPrintSettings.kOutputFormatPDF;
-    ps.printSelectionOnly = isPrintSelection;
-    if (printRange) {
-        ps.pageRanges = printRange.split(',').map(function(r) {
-            let range = r.split('-');
-            return [+range[0] || 1, +range[1] || 1]
-        }).flat();
-    }
-
-    var prefs = Cc["@mozilla.org/preferences-service;1"].
-                getService(Ci.nsIPrefBranch);
-    ps.printInColor = prefs.getBoolPref("print.print_in_color", true);
-
-    g.browser.browsingContext.print(ps)
-        .then(() => SendPrintDone(Cr.NS_OK, file.path))
-        .catch(exception => SendPrintDone(exception.code, file.path));
-}
-
-function RecvPrintResult(runtimeMs, status, fileName)
-{
-    if (!Components.isSuccessCode(status)) {
-      logger.error("REFTEST TEST-UNEXPECTED-FAIL | " + g.currentURL + " | error during printing\n");
-      ++g.testResults.Exception;
-    }
-    RecordResult(runtimeMs, '', fileName);
-}
-
-function RecvTestDone(runtimeMs)
-{
-    RecordResult(runtimeMs, '', [ ]);
-}
-
-async function RecvUpdateCanvasForInvalidation(rects)
-{
-    await UpdateCurrentCanvasForInvalidation(rects);
-    SendUpdateCurrentCanvasWithSnapshotDone(true);
-}
-
-async function RecvUpdateWholeCanvasForInvalidation()
-{
-    await UpdateWholeCurrentCanvasForInvalidation();
-    SendUpdateCurrentCanvasWithSnapshotDone(true);
-}
-
-function OnProcessCrashed(subject, topic, data)
-{
-    let id;
-    let additionalDumps;
-    let propbag = subject.QueryInterface(Ci.nsIPropertyBag2);
-
-    if (topic == "ipc:content-shutdown") {
-        id = propbag.get("dumpID");
-    }
-
-    if (id) {
-        g.expectedCrashDumpFiles.push(id + ".dmp");
-        g.expectedCrashDumpFiles.push(id + ".extra");
-    }
-
-    if (additionalDumps && additionalDumps.length != 0) {
-      for (const name of additionalDumps.split(',')) {
-        g.expectedCrashDumpFiles.push(id + "-" + name + ".dmp");
-      }
-    }
-}
-
-function RegisterProcessCrashObservers()
-{
-    var os = Cc[NS_OBSERVER_SERVICE_CONTRACTID]
-             .getService(Ci.nsIObserverService);
-    os.addObserver(OnProcessCrashed, "ipc:content-shutdown");
-}
-
-function RecvExpectProcessCrash()
-{
-    g.expectingProcessCrash = true;
-}
-
-function SendClear()
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:Clear");
-}
-
-function SendLoadScriptTest(uri, timeout)
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:LoadScriptTest",
-                                            { uri: uri, timeout: timeout });
-}
-
-function SendLoadPrintTest(uri, timeout)
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:LoadPrintTest",
-                                            { uri: uri, timeout: timeout });
-}
-
-function SendLoadTest(type, uri, uriTargetType, timeout)
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:LoadTest",
-                                            { type: type, uri: uri,
-                                              uriTargetType: uriTargetType,
-                                              timeout: timeout }
+function RecvLog(type, msg) {
+  msg = "[CONTENT] " + msg;
+  if (type == "info") {
+    TestBuffer(msg);
+  } else if (type == "warning") {
+    logger.warning(msg);
+  } else if (type == "error") {
+    logger.error(
+      "REFTEST TEST-UNEXPECTED-FAIL | " + g.currentURL + " | " + msg + "\n"
     );
+    ++g.testResults.Exception;
+  } else {
+    logger.error(
+      "REFTEST TEST-UNEXPECTED-FAIL | " +
+        g.currentURL +
+        " | unknown log type " +
+        type +
+        "\n"
+    );
+    ++g.testResults.Exception;
+  }
 }
 
-function SendResetRenderingState()
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:ResetRenderingState");
+function RecvScriptResults(runtimeMs, error, results) {
+  RecordResult(runtimeMs, error, results);
 }
 
-function SendPrintDone(status, fileName)
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:PrintDone", { status, fileName });
+function RecvStartPrint(isPrintSelection, printRange) {
+  let fileName = `reftest-print-${Date.now()}-`;
+  crypto
+    .getRandomValues(new Uint8Array(4))
+    .forEach(x => (fileName += x.toString(16)));
+  fileName += ".pdf";
+  let file = Services.dirsvc.get("TmpD", Ci.nsIFile);
+  file.append(fileName);
+
+  let PSSVC = Cc["@mozilla.org/gfx/printsettings-service;1"].getService(
+    Ci.nsIPrintSettingsService
+  );
+  let ps = PSSVC.createNewPrintSettings();
+  ps.printSilent = true;
+  ps.printBGImages = true;
+  ps.printBGColors = true;
+  ps.unwriteableMarginTop = 0;
+  ps.unwriteableMarginRight = 0;
+  ps.unwriteableMarginLeft = 0;
+  ps.unwriteableMarginBottom = 0;
+  ps.outputDestination = Ci.nsIPrintSettings.kOutputDestinationFile;
+  ps.toFileName = file.path;
+  ps.outputFormat = Ci.nsIPrintSettings.kOutputFormatPDF;
+  ps.printSelectionOnly = isPrintSelection;
+  if (printRange) {
+    ps.pageRanges = printRange
+      .split(",")
+      .map(function (r) {
+        let range = r.split("-");
+        return [+range[0] || 1, +range[1] || 1];
+      })
+      .flat();
+  }
+
+  var prefs = Cc["@mozilla.org/preferences-service;1"].getService(
+    Ci.nsIPrefBranch
+  );
+  ps.printInColor = prefs.getBoolPref("print.print_in_color", true);
+
+  g.browser.browsingContext
+    .print(ps)
+    .then(() => SendPrintDone(Cr.NS_OK, file.path))
+    .catch(exception => SendPrintDone(exception.code, file.path));
 }
 
-function SendUpdateCurrentCanvasWithSnapshotDone(painted)
-{
-    g.browserMessageManager.sendAsyncMessage("reftest:UpdateCanvasWithSnapshotDone", { painted });
+function RecvPrintResult(runtimeMs, status, fileName) {
+  if (!Components.isSuccessCode(status)) {
+    logger.error(
+      "REFTEST TEST-UNEXPECTED-FAIL | " +
+        g.currentURL +
+        " | error during printing\n"
+    );
+    ++g.testResults.Exception;
+  }
+  RecordResult(runtimeMs, "", fileName);
+}
+
+function RecvTestDone(runtimeMs) {
+  RecordResult(runtimeMs, "", []);
+}
+
+async function RecvUpdateCanvasForInvalidation(rects) {
+  await UpdateCurrentCanvasForInvalidation(rects);
+  SendUpdateCurrentCanvasWithSnapshotDone(true);
+}
+
+async function RecvUpdateWholeCanvasForInvalidation() {
+  await UpdateWholeCurrentCanvasForInvalidation();
+  SendUpdateCurrentCanvasWithSnapshotDone(true);
+}
+
+function OnProcessCrashed(subject, topic, data) {
+  let id;
+  let additionalDumps;
+  let propbag = subject.QueryInterface(Ci.nsIPropertyBag2);
+
+  if (topic == "ipc:content-shutdown") {
+    id = propbag.get("dumpID");
+  }
+
+  if (id) {
+    g.expectedCrashDumpFiles.push(id + ".dmp");
+    g.expectedCrashDumpFiles.push(id + ".extra");
+  }
+
+  if (additionalDumps && additionalDumps.length != 0) {
+    for (const name of additionalDumps.split(",")) {
+      g.expectedCrashDumpFiles.push(id + "-" + name + ".dmp");
+    }
+  }
+}
+
+function RegisterProcessCrashObservers() {
+  var os = Cc[NS_OBSERVER_SERVICE_CONTRACTID].getService(Ci.nsIObserverService);
+  os.addObserver(OnProcessCrashed, "ipc:content-shutdown");
+}
+
+function RecvExpectProcessCrash() {
+  g.expectingProcessCrash = true;
+}
+
+function SendClear() {
+  g.browserMessageManager.sendAsyncMessage("reftest:Clear");
+}
+
+function SendLoadScriptTest(uri, timeout) {
+  g.browserMessageManager.sendAsyncMessage("reftest:LoadScriptTest", {
+    uri: uri,
+    timeout: timeout,
+  });
+}
+
+function SendLoadPrintTest(uri, timeout) {
+  g.browserMessageManager.sendAsyncMessage("reftest:LoadPrintTest", {
+    uri: uri,
+    timeout: timeout,
+  });
+}
+
+function SendLoadTest(type, uri, uriTargetType, timeout) {
+  g.browserMessageManager.sendAsyncMessage("reftest:LoadTest", {
+    type: type,
+    uri: uri,
+    uriTargetType: uriTargetType,
+    timeout: timeout,
+  });
+}
+
+function SendResetRenderingState() {
+  g.browserMessageManager.sendAsyncMessage("reftest:ResetRenderingState");
+}
+
+function SendPrintDone(status, fileName) {
+  g.browserMessageManager.sendAsyncMessage("reftest:PrintDone", {
+    status,
+    fileName,
+  });
+}
+
+function SendUpdateCurrentCanvasWithSnapshotDone(painted) {
+  g.browserMessageManager.sendAsyncMessage(
+    "reftest:UpdateCanvasWithSnapshotDone",
+    { painted }
+  );
 }
 
 var pdfjsHasLoaded;
@@ -1920,101 +2144,136 @@ function pdfjsHasLoadedPromise() {
 }
 
 function readPdf(path, callback) {
-    IOUtils.read(path).then(function (data) {
-        pdfjsLib.GlobalWorkerOptions.workerSrc = "resource://pdf.js/build/pdf.worker.js";
-        pdfjsLib.getDocument({
-            data: data
-        }).promise.then(function (pdf) {
+  IOUtils.read(path).then(
+    function (data) {
+      pdfjsLib.GlobalWorkerOptions.workerSrc =
+        "resource://pdf.js/build/pdf.worker.js";
+      pdfjsLib
+        .getDocument({
+          data: data,
+        })
+        .promise.then(
+          function (pdf) {
             callback(null, pdf);
-        }, function (e) {
+          },
+          function (e) {
             callback(new Error(`Couldn't parse ${path}, exception: ${e}`));
-        });
-        return;
-    }, function (e) {
-        callback(new Error(`Couldn't read PDF ${path}, exception: ${e}`));
-    });
+          }
+        );
+      return;
+    },
+    function (e) {
+      callback(new Error(`Couldn't read PDF ${path}, exception: ${e}`));
+    }
+  );
 }
 
 function comparePdfs(pathToTestPdf, pathToRefPdf, callback) {
-    pdfjsHasLoadedPromise().then(() =>
-      Promise.all([pathToTestPdf, pathToRefPdf].map(function(path) {
-        return new Promise(function(resolve, reject) {
-            readPdf(path, function(error, pdf) {
-                // Resolve or reject outer promise. reject and resolve are
-                // passed to the callback function given as first arguments
-                // to the Promise constructor.
-                if (error) {
-                    reject(error);
-                } else {
-                    resolve(pdf);
-                }
+  pdfjsHasLoadedPromise()
+    .then(() =>
+      Promise.all(
+        [pathToTestPdf, pathToRefPdf].map(function (path) {
+          return new Promise(function (resolve, reject) {
+            readPdf(path, function (error, pdf) {
+              // Resolve or reject outer promise. reject and resolve are
+              // passed to the callback function given as first arguments
+              // to the Promise constructor.
+              if (error) {
+                reject(error);
+              } else {
+                resolve(pdf);
+              }
             });
-        });
-    }))).then(function(pdfs) {
+          });
+        })
+      )
+    )
+    .then(
+      function (pdfs) {
         let numberOfPages = pdfs[1].numPages;
         let sameNumberOfPages = numberOfPages === pdfs[0].numPages;
 
-        let resultPromises = [Promise.resolve({
+        let resultPromises = [
+          Promise.resolve({
             passed: sameNumberOfPages,
-            description: "Expected number of pages: " + numberOfPages +
-                                             ", got " + pdfs[0].numPages
-        })];
+            description:
+              "Expected number of pages: " +
+              numberOfPages +
+              ", got " +
+              pdfs[0].numPages,
+          }),
+        ];
 
         if (sameNumberOfPages) {
-            for (let i = 0; i < numberOfPages; i++) {
-                let pageNum = i + 1;
-                let testPagePromise = pdfs[0].getPage(pageNum);
-                let refPagePromise = pdfs[1].getPage(pageNum);
-                resultPromises.push(new Promise(function(resolve, reject) {
-                    Promise.all([testPagePromise, refPagePromise]).then(function(pages) {
-                        let testTextPromise = pages[0].getTextContent();
-                        let refTextPromise = pages[1].getTextContent();
-                        Promise.all([testTextPromise, refTextPromise]).then(function(texts) {
-                            let testTextItems = texts[0].items;
-                            let refTextItems = texts[1].items;
-                            let testText;
-                            let refText;
-                            let passed = refTextItems.every(function(o, i) {
-                                refText = o.str;
-                                if (!testTextItems[i]) {
-                                    return false;
-                                }
-                                testText = testTextItems[i].str;
-                                return testText === refText;
-                            });
-                            let description;
-                            if (passed) {
-                                if (testTextItems.length > refTextItems.length) {
-                                    passed = false;
-                                    description = "Page " + pages[0].pageNumber +
-                                        " contains unexpected text like '" +
-                                        testTextItems[refTextItems.length].str + "'";
-                                } else {
-                                    description = "Page " + pages[0].pageNumber +
-                                        " contains same text"
-                                }
-                            } else {
-                                description = "Expected page " + pages[0].pageNumber +
-                                    " to contain text '" + refText;
-                                if (testText) {
-                                    description += "' but found '" + testText +
-                                        "' instead";
-                                }
-                            }
-                            resolve({
-                                passed: passed,
-                                description: description
-                            });
-                        }, reject);
-                    }, reject);
-                }));
-            }
+          for (let i = 0; i < numberOfPages; i++) {
+            let pageNum = i + 1;
+            let testPagePromise = pdfs[0].getPage(pageNum);
+            let refPagePromise = pdfs[1].getPage(pageNum);
+            resultPromises.push(
+              new Promise(function (resolve, reject) {
+                Promise.all([testPagePromise, refPagePromise]).then(function (
+                  pages
+                ) {
+                  let testTextPromise = pages[0].getTextContent();
+                  let refTextPromise = pages[1].getTextContent();
+                  Promise.all([testTextPromise, refTextPromise]).then(function (
+                    texts
+                  ) {
+                    let testTextItems = texts[0].items;
+                    let refTextItems = texts[1].items;
+                    let testText;
+                    let refText;
+                    let passed = refTextItems.every(function (o, i) {
+                      refText = o.str;
+                      if (!testTextItems[i]) {
+                        return false;
+                      }
+                      testText = testTextItems[i].str;
+                      return testText === refText;
+                    });
+                    let description;
+                    if (passed) {
+                      if (testTextItems.length > refTextItems.length) {
+                        passed = false;
+                        description =
+                          "Page " +
+                          pages[0].pageNumber +
+                          " contains unexpected text like '" +
+                          testTextItems[refTextItems.length].str +
+                          "'";
+                      } else {
+                        description =
+                          "Page " + pages[0].pageNumber + " contains same text";
+                      }
+                    } else {
+                      description =
+                        "Expected page " +
+                        pages[0].pageNumber +
+                        " to contain text '" +
+                        refText;
+                      if (testText) {
+                        description += "' but found '" + testText + "' instead";
+                      }
+                    }
+                    resolve({
+                      passed: passed,
+                      description: description,
+                    });
+                  },
+                  reject);
+                },
+                reject);
+              })
+            );
+          }
         }
 
         Promise.all(resultPromises).then(function (results) {
-            callback(null, results);
+          callback(null, results);
         });
-    }, function(error) {
+      },
+      function (error) {
         callback(error);
-    });
+      }
+    );
 }
diff --git a/layout/tools/reftest/reftest.xhtml b/layout/tools/reftest/reftest.xhtml
index a698c08b77c0..bc9f6e169b0d 100644
--- a/layout/tools/reftest/reftest.xhtml
+++ b/layout/tools/reftest/reftest.xhtml
@@ -1,12 +1,14 @@
 <!-- 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/. -->
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        id="reftest-window"
-        hidechrome="true"
-        onload="OnRefTestLoad();"
-        onunload="OnRefTestUnload();"
-        style="background:white; overflow:hidden">
-    <script type="application/ecmascript" src="resource://reftest/reftest.jsm" />
-    <!-- The reftest browser element is dynamically created, here -->
+<window
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  id="reftest-window"
+  hidechrome="true"
+  onload="OnRefTestLoad();"
+  onunload="OnRefTestUnload();"
+  style="background: white; overflow: hidden"
+>
+  <script type="application/ecmascript" src="resource://reftest/reftest.jsm" />
+  <!-- The reftest browser element is dynamically created, here -->
 </window>
diff --git a/layout/tools/reftest/selftest/files/assert.html b/layout/tools/reftest/selftest/files/assert.html
index c9aedcf1169e..fbe511192654 100644
--- a/layout/tools/reftest/selftest/files/assert.html
+++ b/layout/tools/reftest/selftest/files/assert.html
@@ -1,7 +1,7 @@
 <script>
-const Cc = SpecialPowers.Cc;
-const Ci = SpecialPowers.Ci;
+  const Cc = SpecialPowers.Cc;
+  const Ci = SpecialPowers.Ci;
 
-let debug = Cc["@mozilla.org/xpcom/debug;1"].getService(Ci.nsIDebug2);
-debug.assertion('failed assertion check', 'false', 'assert.html', 6);
+  let debug = Cc["@mozilla.org/xpcom/debug;1"].getService(Ci.nsIDebug2);
+  debug.assertion("failed assertion check", "false", "assert.html", 6);
 </script>
diff --git a/layout/tools/reftest/selftest/files/crash.html b/layout/tools/reftest/selftest/files/crash.html
index 897863024b36..e8ae055c4ced 100644
--- a/layout/tools/reftest/selftest/files/crash.html
+++ b/layout/tools/reftest/selftest/files/crash.html
@@ -1,7 +1,7 @@
 <script>
-const Cc = SpecialPowers.Cc;
-const Ci = SpecialPowers.Ci;
+  const Cc = SpecialPowers.Cc;
+  const Ci = SpecialPowers.Ci;
 
-let debug = Cc["@mozilla.org/xpcom/debug;1"].getService(Ci.nsIDebug2);
-debug.abort('crash.html', 6);
+  let debug = Cc["@mozilla.org/xpcom/debug;1"].getService(Ci.nsIDebug2);
+  debug.abort("crash.html", 6);
 </script>
diff --git a/layout/tools/reftest/selftest/files/green.html b/layout/tools/reftest/selftest/files/green.html
index d1695cb8b8ed..bd7e2ec1b8af 100644
--- a/layout/tools/reftest/selftest/files/green.html
+++ b/layout/tools/reftest/selftest/files/green.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<body>
-<div style="color: green">Text</div>
-</body>
+  <body>
+    <div style="color: green">Text</div>
+  </body>
 </html>
diff --git a/layout/tools/reftest/selftest/files/red.html b/layout/tools/reftest/selftest/files/red.html
index a9db5be4dff8..69d8f058396f 100644
--- a/layout/tools/reftest/selftest/files/red.html
+++ b/layout/tools/reftest/selftest/files/red.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-<body>
-<div style="color: red">Text</div>
-</body>
+  <body>
+    <div style="color: red">Text</div>
+  </body>
 </html>
diff --git a/layout/tools/reftest/selftest/files/scripttest-pass.html b/layout/tools/reftest/selftest/files/scripttest-pass.html
index e0371b3518bf..9a35849eb37a 100644
--- a/layout/tools/reftest/selftest/files/scripttest-pass.html
+++ b/layout/tools/reftest/selftest/files/scripttest-pass.html
@@ -1,17 +1,23 @@
 <!DOCTYPE html>
 <html>
-<head>
-<title>scripttest-pass</title>
-<script type="text/javascript">
-function getTestCases()
-{
-  return [
-    { testPassed: (function () { return true; }), testDescription: (function () { return "passed"; }) }
-  ];
-}
-</script>
-</head>
-<body>
-<h1>scripttest-pass</h1>
-</body>
+  <head>
+    <title>scripttest-pass</title>
+    <script type="text/javascript">
+      function getTestCases() {
+        return [
+          {
+            testPassed: function () {
+              return true;
+            },
+            testDescription: function () {
+              return "passed";
+            },
+          },
+        ];
+      }
+    </script>
+  </head>
+  <body>
+    <h1>scripttest-pass</h1>
+  </body>
 </html>